diff --git a/.editorconfig b/.editorconfig index 57f92cb572c..6f6e668dc7b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,3 +10,4 @@ insert_final_newline = true ij_java_use_single_class_imports = true ij_java_class_count_to_use_import_on_demand = 999 ij_java_names_count_to_use_import_on_demand = 999 +ij_java_imports_layout = java.**,javax.**,|,jakarta.**,|,org.keycloak.**,|,*,|,$jakarta.**,$java.**,javax.**,|,$org.keycloak.**,|,$* diff --git a/adapters/saml/core-public/src/main/java/org/keycloak/adapters/saml/SamlAuthenticationError.java b/adapters/saml/core-public/src/main/java/org/keycloak/adapters/saml/SamlAuthenticationError.java index f44534d542e..eb4ed0a5f39 100755 --- a/adapters/saml/core-public/src/main/java/org/keycloak/adapters/saml/SamlAuthenticationError.java +++ b/adapters/saml/core-public/src/main/java/org/keycloak/adapters/saml/SamlAuthenticationError.java @@ -17,11 +17,12 @@ package org.keycloak.adapters.saml; +import java.util.Objects; + import org.keycloak.adapters.spi.AuthenticationError; import org.keycloak.dom.saml.v2.protocol.StatusCodeType; import org.keycloak.dom.saml.v2.protocol.StatusResponseType; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; -import java.util.Objects; /** * Object that describes the SAML error that happened. diff --git a/adapters/saml/core-public/src/main/java/org/keycloak/adapters/saml/SamlPrincipal.java b/adapters/saml/core-public/src/main/java/org/keycloak/adapters/saml/SamlPrincipal.java index 6eb8571f783..ded713f3856 100755 --- a/adapters/saml/core-public/src/main/java/org/keycloak/adapters/saml/SamlPrincipal.java +++ b/adapters/saml/core-public/src/main/java/org/keycloak/adapters/saml/SamlPrincipal.java @@ -17,10 +17,6 @@ package org.keycloak.adapters.saml; -import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.dom.saml.v2.assertion.AssertionType; - -import org.keycloak.dom.saml.v2.assertion.NameIDType; import java.io.Serializable; import java.net.URI; import java.security.Principal; @@ -28,6 +24,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; + +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.dom.saml.v2.assertion.AssertionType; +import org.keycloak.dom.saml.v2.assertion.NameIDType; + import org.w3c.dom.Document; /** diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/HttpAdapterUtils.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/HttpAdapterUtils.java index 0fa330e5f6e..c838eb1c6b1 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/HttpAdapterUtils.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/HttpAdapterUtils.java @@ -17,19 +17,20 @@ package org.keycloak.adapters.cloned; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; - import java.io.IOException; import java.io.InputStream; import javax.xml.crypto.dsig.keyinfo.KeyInfo; + +import org.keycloak.adapters.saml.descriptor.parsers.SamlDescriptorIDPKeysExtractor; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.saml.common.exceptions.ParsingException; + +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.apache.http.util.EntityUtils; -import org.keycloak.adapters.saml.descriptor.parsers.SamlDescriptorIDPKeysExtractor; -import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.saml.common.exceptions.ParsingException; /** * @author Hynek Mlnařík diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/HttpClientBuilder.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/HttpClientBuilder.java index c3706a62db7..71a8e916098 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/HttpClientBuilder.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/HttpClientBuilder.java @@ -17,9 +17,32 @@ package org.keycloak.adapters.cloned; +import java.io.IOException; +import java.net.URI; +import java.security.KeyStore; +import java.security.SecureRandom; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.concurrent.TimeUnit; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLException; +import javax.net.ssl.SSLSession; +import javax.net.ssl.SSLSocket; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + +import org.keycloak.common.util.EnvUtil; +import org.keycloak.common.util.KeystoreUtil; + import org.apache.http.HttpHost; import org.apache.http.client.CookieStore; import org.apache.http.client.HttpClient; +import org.apache.http.client.params.ClientPNames; +import org.apache.http.client.params.CookiePolicy; import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.params.ConnRoutePNames; import org.apache.http.conn.scheme.PlainSocketFactory; @@ -36,28 +59,6 @@ import org.apache.http.impl.conn.SingleClientConnManager; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; import org.apache.http.params.BasicHttpParams; import org.apache.http.params.HttpConnectionParams; -import org.keycloak.common.util.EnvUtil; -import org.keycloak.common.util.KeystoreUtil; - -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLException; -import javax.net.ssl.SSLSession; -import javax.net.ssl.SSLSocket; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import java.io.IOException; -import java.net.URI; -import java.security.KeyStore; -import java.security.SecureRandom; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.concurrent.TimeUnit; -import org.apache.http.client.params.ClientPNames; -import org.apache.http.client.params.CookiePolicy; /** * Abstraction for creating HttpClients. Allows SSL configuration. diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/SniSSLSocketFactory.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/SniSSLSocketFactory.java index 32a276c0144..d6e5c1081cb 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/SniSSLSocketFactory.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/cloned/SniSSLSocketFactory.java @@ -17,16 +17,6 @@ package org.keycloak.adapters.cloned; -import org.apache.http.HttpHost; -import org.apache.http.conn.scheme.HostNameResolver; -import org.apache.http.conn.ssl.SSLSocketFactory; -import org.apache.http.conn.ssl.TrustStrategy; -import org.apache.http.conn.ssl.X509HostnameVerifier; -import org.apache.http.protocol.HttpContext; -import org.keycloak.common.util.Environment; - -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocket; import java.io.IOException; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -44,6 +34,17 @@ import java.security.UnrecoverableKeyException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.logging.Level; import java.util.logging.Logger; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSocket; + +import org.keycloak.common.util.Environment; + +import org.apache.http.HttpHost; +import org.apache.http.conn.scheme.HostNameResolver; +import org.apache.http.conn.ssl.SSLSocketFactory; +import org.apache.http.conn.ssl.TrustStrategy; +import org.apache.http.conn.ssl.X509HostnameVerifier; +import org.apache.http.protocol.HttpContext; /** * SSLSocketFactory that uses Server Name Indication (SNI) TLS extension. diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/AbstractInitiateLogin.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/AbstractInitiateLogin.java index adaecdcba0b..27ed28d83f5 100755 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/AbstractInitiateLogin.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/AbstractInitiateLogin.java @@ -17,8 +17,10 @@ package org.keycloak.adapters.saml; +import java.io.IOException; +import java.security.KeyPair; + import org.keycloak.adapters.saml.SamlDeployment.IDP.SingleSignOnService; -import org.jboss.logging.Logger; import org.keycloak.adapters.spi.AuthChallenge; import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.saml.BaseSAML2BindingBuilder; @@ -28,8 +30,7 @@ import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.common.exceptions.ConfigurationException; import org.keycloak.saml.common.exceptions.ProcessingException; -import java.io.IOException; -import java.security.KeyPair; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/DefaultSamlDeployment.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/DefaultSamlDeployment.java index 2194d8cda51..c9125d95561 100755 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/DefaultSamlDeployment.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/DefaultSamlDeployment.java @@ -17,21 +17,22 @@ package org.keycloak.adapters.saml; -import org.keycloak.common.enums.SslRequired; -import org.keycloak.saml.SignatureAlgorithm; - +import java.net.URI; import java.security.KeyPair; import java.security.PrivateKey; import java.security.PublicKey; import java.util.LinkedList; import java.util.List; import java.util.Set; -import org.apache.http.client.HttpClient; + import org.keycloak.adapters.saml.rotation.SamlDescriptorPublicKeyLocator; +import org.keycloak.common.enums.SslRequired; import org.keycloak.rotation.CompositeKeyLocator; import org.keycloak.rotation.HardcodedKeyLocator; import org.keycloak.rotation.KeyLocator; -import java.net.URI; +import org.keycloak.saml.SignatureAlgorithm; + +import org.apache.http.client.HttpClient; /** * @author Bill Burke diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/PropertiesBasedRoleMapper.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/PropertiesBasedRoleMapper.java index 17fb3dbdeae..33920523102 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/PropertiesBasedRoleMapper.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/PropertiesBasedRoleMapper.java @@ -24,9 +24,10 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; -import org.jboss.logging.Logger; import org.keycloak.adapters.saml.config.parsers.ResourceLoader; +import org.jboss.logging.Logger; + /** * A {@link RoleMappingsProvider} implementation that uses a {@code properties} file to determine the mappings that should be applied * to the SAML principal and roles. It is always identified by the id {@code properties-based-role-mapper} in {@code keycloak-saml.xml}. diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/RoleMappingsProviderUtils.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/RoleMappingsProviderUtils.java index cef1022724f..b27a1057e57 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/RoleMappingsProviderUtils.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/RoleMappingsProviderUtils.java @@ -22,10 +22,11 @@ import java.util.Map; import java.util.Properties; import java.util.ServiceLoader; -import org.jboss.logging.Logger; import org.keycloak.adapters.saml.config.SP; import org.keycloak.adapters.saml.config.parsers.ResourceLoader; +import org.jboss.logging.Logger; + /** * Utility class that allows for the instantiation and configuration of role mappings providers. * diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java index 102424eacf0..d41ce9dc29f 100755 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlAuthenticator.java @@ -17,7 +17,6 @@ package org.keycloak.adapters.saml; -import org.jboss.logging.Logger; import org.keycloak.adapters.saml.profile.SamlAuthenticationHandler; import org.keycloak.adapters.saml.profile.ecp.EcpAuthenticationHandler; import org.keycloak.adapters.saml.profile.webbrowsersso.WebBrowserSsoAuthenticationHandler; @@ -25,6 +24,8 @@ import org.keycloak.adapters.spi.AuthChallenge; import org.keycloak.adapters.spi.AuthOutcome; import org.keycloak.adapters.spi.HttpFacade; +import org.jboss.logging.Logger; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlDeployment.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlDeployment.java index e48b47621d5..8f704a40a76 100755 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlDeployment.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlDeployment.java @@ -17,15 +17,16 @@ package org.keycloak.adapters.saml; -import org.keycloak.common.enums.SslRequired; -import org.keycloak.saml.SignatureAlgorithm; - +import java.net.URI; import java.security.KeyPair; import java.security.PrivateKey; import java.util.Set; -import org.apache.http.client.HttpClient; + +import org.keycloak.common.enums.SslRequired; import org.keycloak.rotation.KeyLocator; -import java.net.URI; +import org.keycloak.saml.SignatureAlgorithm; + +import org.apache.http.client.HttpClient; /** * Represents SAML deployment configuration. diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlSession.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlSession.java index 76024dddcf5..d8deb50e652 100755 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlSession.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlSession.java @@ -17,11 +17,11 @@ package org.keycloak.adapters.saml; -import org.keycloak.adapters.spi.KeycloakAccount; - -import javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; import java.util.Set; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.keycloak.adapters.spi.KeycloakAccount; /** * @author Bill Burke diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlSessionStore.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlSessionStore.java index 9ce149821a1..f3e4b3feb98 100755 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlSessionStore.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlSessionStore.java @@ -17,10 +17,10 @@ package org.keycloak.adapters.saml; -import org.keycloak.adapters.spi.AdapterSessionStore; - import java.util.List; +import org.keycloak.adapters.spi.AdapterSessionStore; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlUtil.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlUtil.java index 656414ac3d5..e8f6dda05f2 100755 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlUtil.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/SamlUtil.java @@ -17,18 +17,19 @@ package org.keycloak.adapters.saml; -import org.jboss.logging.Logger; +import java.io.IOException; +import javax.xml.datatype.DatatypeConstants; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.adapters.spi.HttpFacade; import org.keycloak.saml.BaseSAML2BindingBuilder; import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.saml.common.exceptions.ConfigurationException; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import org.w3c.dom.Document; -import javax.xml.datatype.DatatypeConstants; -import javax.xml.datatype.XMLGregorianCalendar; -import java.io.IOException; +import org.jboss.logging.Logger; +import org.w3c.dom.Document; /** * @author Bill Burke diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/PemUtils.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/PemUtils.java index 26f48de7395..27d35f35c9c 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/PemUtils.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/PemUtils.java @@ -35,11 +35,12 @@ import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; import java.util.Base64; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.jboss.logging.Logger; import org.keycloak.common.crypto.CryptoConstants; import org.keycloak.common.util.PemException; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.jboss.logging.Logger; + /** * Fork of the PemUtils from common module to avoid dependency on keycloak-crypto-default */ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/AbstractKeycloakSamlAdapterV1Parser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/AbstractKeycloakSamlAdapterV1Parser.java index 361c03e6c17..af45419c585 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/AbstractKeycloakSamlAdapterV1Parser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/AbstractKeycloakSamlAdapterV1Parser.java @@ -17,16 +17,16 @@ package org.keycloak.adapters.saml.config.parsers; -import org.keycloak.saml.common.parsers.AbstractStaxParser; - -import org.keycloak.saml.common.util.StaxParserUtil; -import org.keycloak.saml.processing.core.parsers.util.QNameEnumLookup; import java.util.Collections; import java.util.Set; import javax.xml.XMLConstants; import javax.xml.namespace.QName; import javax.xml.stream.events.StartElement; +import org.keycloak.saml.common.parsers.AbstractStaxParser; +import org.keycloak.saml.common.util.StaxParserUtil; +import org.keycloak.saml.processing.core.parsers.util.QNameEnumLookup; + /** * */ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/DeploymentBuilder.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/DeploymentBuilder.java index 298d0b2b8d0..6b00e19804d 100755 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/DeploymentBuilder.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/DeploymentBuilder.java @@ -17,7 +17,24 @@ package org.keycloak.adapters.saml.config.parsers; -import org.jboss.logging.Logger; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.InputStream; +import java.net.URI; +import java.security.KeyPair; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.cert.Certificate; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +import org.keycloak.adapters.cloned.HttpClientBuilder; import org.keycloak.adapters.saml.DefaultSamlDeployment; import org.keycloak.adapters.saml.RoleMappingsProviderUtils; import org.keycloak.adapters.saml.SamlDeployment; @@ -30,23 +47,7 @@ import org.keycloak.common.enums.SslRequired; import org.keycloak.saml.SignatureAlgorithm; import org.keycloak.saml.common.exceptions.ParsingException; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.InputStream; -import java.security.KeyPair; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.cert.Certificate; -import java.util.HashSet; -import java.util.Set; -import org.keycloak.adapters.cloned.HttpClientBuilder; -import java.net.URI; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.concurrent.TimeUnit; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/HttpClientParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/HttpClientParser.java index cfa3ea00e83..904e2afa045 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/HttpClientParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/HttpClientParser.java @@ -17,13 +17,13 @@ package org.keycloak.adapters.saml.config.parsers; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.adapters.saml.config.IDP.HttpClientConfig; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/IdpParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/IdpParser.java index 3ccfa374966..ea3bd08d4bb 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/IdpParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/IdpParser.java @@ -17,14 +17,14 @@ package org.keycloak.adapters.saml.config.parsers; +import java.util.concurrent.TimeUnit; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.adapters.saml.config.IDP; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.util.concurrent.TimeUnit; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeyParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeyParser.java index ed9767ca383..3e1ab51fd76 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeyParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeyParser.java @@ -17,15 +17,15 @@ package org.keycloak.adapters.saml.config.parsers; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.adapters.saml.config.Key; import org.keycloak.common.util.StringPropertyReplacer; import org.keycloak.common.util.SystemEnvProperties; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeyStoreParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeyStoreParser.java index 9cdfaf4e1f3..6ef0c509510 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeyStoreParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeyStoreParser.java @@ -17,14 +17,14 @@ package org.keycloak.adapters.saml.config.parsers; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.adapters.saml.config.Key; import org.keycloak.adapters.saml.config.Key.KeyStoreConfig; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterParser.java index 2b3bf600023..4f794161732 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterParser.java @@ -16,11 +16,6 @@ */ package org.keycloak.adapters.saml.config.parsers; -import org.keycloak.saml.common.ErrorCodes; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.common.parsers.AbstractParser; -import org.keycloak.saml.common.parsers.StaxParser; -import org.keycloak.saml.common.util.StaxParserUtil; import java.util.HashMap; import java.util.Map; import javax.xml.namespace.QName; @@ -28,6 +23,12 @@ import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import org.keycloak.saml.common.ErrorCodes; +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.parsers.AbstractParser; +import org.keycloak.saml.common.parsers.StaxParser; +import org.keycloak.saml.common.util.StaxParserUtil; + /** * * @author hmlnarik diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterV1Parser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterV1Parser.java index 72d35f99059..5cf738d2a64 100755 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterV1Parser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterV1Parser.java @@ -17,13 +17,13 @@ package org.keycloak.adapters.saml.config.parsers; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.adapters.saml.config.KeycloakSamlAdapter; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterV1QNames.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterV1QNames.java index c12265fe73e..b42769b2ac5 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterV1QNames.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterV1QNames.java @@ -16,9 +16,10 @@ */ package org.keycloak.adapters.saml.config.parsers; -import org.keycloak.saml.processing.core.parsers.util.HasQName; import javax.xml.namespace.QName; +import org.keycloak.saml.processing.core.parsers.util.HasQName; + /** * * @author hmlnarik diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeysParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeysParser.java index bd1b4d02382..a153b71893f 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeysParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/KeysParser.java @@ -17,14 +17,14 @@ package org.keycloak.adapters.saml.config.parsers; -import org.keycloak.adapters.saml.config.Key; -import org.keycloak.saml.common.exceptions.ParsingException; - import java.util.LinkedList; import java.util.List; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; +import org.keycloak.adapters.saml.config.Key; +import org.keycloak.saml.common.exceptions.ParsingException; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/PrincipalNameMappingParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/PrincipalNameMappingParser.java index 74383824e73..c9a1a78324a 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/PrincipalNameMappingParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/PrincipalNameMappingParser.java @@ -17,13 +17,13 @@ package org.keycloak.adapters.saml.config.parsers; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.adapters.saml.config.SP; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/RoleMappingParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/RoleMappingParser.java index ac4c8ab935a..18269528bab 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/RoleMappingParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/RoleMappingParser.java @@ -17,14 +17,14 @@ package org.keycloak.adapters.saml.config.parsers; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.common.util.StaxParserUtil; - import java.util.HashSet; import java.util.Set; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.util.StaxParserUtil; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/RoleMappingsProviderParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/RoleMappingsProviderParser.java index 1e1baeb2da9..c6a7b3c8878 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/RoleMappingsProviderParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/RoleMappingsProviderParser.java @@ -18,7 +18,6 @@ package org.keycloak.adapters.saml.config.parsers; import java.util.Properties; - import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SingleLogoutServiceParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SingleLogoutServiceParser.java index 7340058f0e5..cf766316b0a 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SingleLogoutServiceParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SingleLogoutServiceParser.java @@ -17,13 +17,13 @@ package org.keycloak.adapters.saml.config.parsers; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.adapters.saml.config.IDP; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SingleSignOnServiceParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SingleSignOnServiceParser.java index 52306c3d3eb..32a0e74da9a 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SingleSignOnServiceParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SingleSignOnServiceParser.java @@ -17,13 +17,13 @@ package org.keycloak.adapters.saml.config.parsers; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.adapters.saml.config.IDP; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SpParser.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SpParser.java index e1859a64d34..a09a3a275bb 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SpParser.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/config/parsers/SpParser.java @@ -17,13 +17,13 @@ package org.keycloak.adapters.saml.config.parsers; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.adapters.saml.config.SP; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/descriptor/parsers/SamlDescriptorIDPKeysExtractor.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/descriptor/parsers/SamlDescriptorIDPKeysExtractor.java index 132567e6948..678e0241f2f 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/descriptor/parsers/SamlDescriptorIDPKeysExtractor.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/descriptor/parsers/SamlDescriptorIDPKeysExtractor.java @@ -29,6 +29,7 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.saml.common.constants.JBossSAMLConstants; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; @@ -36,6 +37,7 @@ import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.processing.core.parsers.saml.xmldsig.XmlDSigQNames; import org.keycloak.saml.processing.core.util.NamespaceContext; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/AbstractSamlAuthenticationHandler.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/AbstractSamlAuthenticationHandler.java index bc8b407751e..77a4f8ea290 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/AbstractSamlAuthenticationHandler.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/AbstractSamlAuthenticationHandler.java @@ -17,8 +17,6 @@ package org.keycloak.adapters.saml.profile; -import static org.keycloak.adapters.saml.SamlPrincipal.DEFAULT_ROLE_ATTRIBUTE_NAME; - import java.io.IOException; import java.net.URI; import java.nio.charset.StandardCharsets; @@ -32,7 +30,7 @@ import java.util.Set; import javax.xml.crypto.dsig.XMLSignature; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; -import org.jboss.logging.Logger; + import org.keycloak.adapters.saml.AbstractInitiateLogin; import org.keycloak.adapters.saml.AdapterConstants; import org.keycloak.adapters.saml.OnSessionCreated; @@ -84,11 +82,15 @@ import org.keycloak.saml.processing.core.util.XMLEncryptionUtil; import org.keycloak.saml.processing.web.util.PostBindingUtil; import org.keycloak.saml.validators.ConditionsValidator; import org.keycloak.saml.validators.DestinationValidator; + +import org.jboss.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import static org.keycloak.adapters.saml.SamlPrincipal.DEFAULT_ROLE_ATTRIBUTE_NAME; + /** * * @author Bill Burke diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java index 78b5d9eea1c..a8d174ab3d6 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/profile/ecp/EcpAuthenticationHandler.java @@ -17,6 +17,14 @@ package org.keycloak.adapters.saml.profile.ecp; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPBody; +import jakarta.xml.soap.SOAPEnvelope; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.soap.SOAPHeaderElement; +import jakarta.xml.soap.SOAPMessage; + import org.keycloak.adapters.saml.AbstractInitiateLogin; import org.keycloak.adapters.saml.OnSessionCreated; import org.keycloak.adapters.saml.SamlDeployment; @@ -33,17 +41,10 @@ import org.keycloak.saml.common.constants.JBossSAMLConstants; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.saml.v2.util.DocumentUtil; import org.keycloak.saml.processing.web.util.PostBindingUtil; + import org.w3c.dom.Document; import org.w3c.dom.Node; -import jakarta.xml.soap.MessageFactory; -import jakarta.xml.soap.SOAPBody; -import jakarta.xml.soap.SOAPEnvelope; -import jakarta.xml.soap.SOAPException; -import jakarta.xml.soap.SOAPHeader; -import jakarta.xml.soap.SOAPHeaderElement; -import jakarta.xml.soap.SOAPMessage; - /** * @author Pedro Igor */ diff --git a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/rotation/SamlDescriptorPublicKeyLocator.java b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/rotation/SamlDescriptorPublicKeyLocator.java index febaee398da..a247c56ec2d 100644 --- a/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/rotation/SamlDescriptorPublicKeyLocator.java +++ b/adapters/saml/core/src/main/java/org/keycloak/adapters/saml/rotation/SamlDescriptorPublicKeyLocator.java @@ -28,8 +28,7 @@ import java.util.concurrent.ConcurrentHashMap; import javax.security.auth.x500.X500Principal; import javax.xml.crypto.dsig.keyinfo.KeyInfo; import javax.xml.crypto.dsig.keyinfo.KeyName; -import org.apache.http.client.HttpClient; -import org.jboss.logging.Logger; + import org.keycloak.adapters.cloned.HttpAdapterUtils; import org.keycloak.adapters.cloned.HttpClientAdapterException; import org.keycloak.common.util.MultivaluedHashMap; @@ -39,6 +38,9 @@ import org.keycloak.dom.saml.v2.metadata.KeyTypes; import org.keycloak.rotation.KeyLocator; import org.keycloak.saml.processing.api.util.KeyInfoTools; +import org.apache.http.client.HttpClient; +import org.jboss.logging.Logger; + /** * This class defines a {@link KeyLocator} that looks up public keys and certificates in IdP's * SAML descriptor (i.e. http://{host}/auth/realms/{realm}/protocol/saml/descriptor). diff --git a/adapters/saml/core/src/test/java/org/keycloak/adapters/cloned/HttpAdapterUtilsTest.java b/adapters/saml/core/src/test/java/org/keycloak/adapters/cloned/HttpAdapterUtilsTest.java index f57dba98eaa..8283b6b8d00 100644 --- a/adapters/saml/core/src/test/java/org/keycloak/adapters/cloned/HttpAdapterUtilsTest.java +++ b/adapters/saml/core/src/test/java/org/keycloak/adapters/cloned/HttpAdapterUtilsTest.java @@ -12,18 +12,21 @@ import javax.xml.crypto.XMLStructure; import javax.xml.crypto.dsig.keyinfo.KeyInfo; import javax.xml.crypto.dsig.keyinfo.KeyName; import javax.xml.crypto.dsig.keyinfo.X509Data; + +import org.keycloak.adapters.saml.config.parsers.KeycloakSamlAdapterV1QNames; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.dom.saml.v2.metadata.KeyTypes; +import org.keycloak.saml.common.exceptions.ParsingException; + import org.hamcrest.Matcher; +import org.junit.Test; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.notNullValue; -import org.junit.Test; import static org.junit.Assert.assertThat; -import org.keycloak.adapters.saml.config.parsers.KeycloakSamlAdapterV1QNames; -import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.dom.saml.v2.metadata.KeyTypes; -import org.keycloak.saml.common.exceptions.ParsingException; /** * diff --git a/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/DeploymentBuilderTest.java b/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/DeploymentBuilderTest.java index 993b71a11dc..37f550e8635 100644 --- a/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/DeploymentBuilderTest.java +++ b/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/DeploymentBuilderTest.java @@ -21,11 +21,12 @@ package org.keycloak.adapters.saml; import java.io.InputStream; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.adapters.saml.config.parsers.DeploymentBuilder; import org.keycloak.adapters.saml.config.parsers.ResourceLoader; +import org.junit.Assert; +import org.junit.Test; + /** * @author Marek Posolda */ diff --git a/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/PropertiesBasedRoleMapperTest.java b/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/PropertiesBasedRoleMapperTest.java index 4045c4e479f..dc2a56b626e 100644 --- a/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/PropertiesBasedRoleMapperTest.java +++ b/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/PropertiesBasedRoleMapperTest.java @@ -22,10 +22,11 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import org.junit.Test; import org.keycloak.adapters.saml.config.parsers.DeploymentBuilder; import org.keycloak.adapters.saml.config.parsers.ResourceLoader; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterXMLParserTest.java b/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterXMLParserTest.java index 932354f5766..5f9ee0d5f91 100755 --- a/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterXMLParserTest.java +++ b/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/config/parsers/KeycloakSamlAdapterXMLParserTest.java @@ -17,29 +17,29 @@ package org.keycloak.adapters.saml.config.parsers; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import java.util.concurrent.TimeUnit; + +import org.keycloak.adapters.saml.config.IDP; +import org.keycloak.adapters.saml.config.Key; +import org.keycloak.adapters.saml.config.KeycloakSamlAdapter; +import org.keycloak.adapters.saml.config.SP; +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.util.StaxParserUtil; + +import org.hamcrest.Matchers; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; -import org.junit.Test; -import org.keycloak.adapters.saml.config.IDP; -import org.keycloak.adapters.saml.config.Key; -import org.keycloak.adapters.saml.config.KeycloakSamlAdapter; -import org.keycloak.adapters.saml.config.SP; -import org.keycloak.saml.common.util.StaxParserUtil; - -import java.io.InputStream; -import org.junit.Rule; -import org.junit.rules.ExpectedException; -import org.keycloak.saml.common.exceptions.ParsingException; -import java.io.IOException; -import java.util.Properties; -import java.util.concurrent.TimeUnit; - -import org.hamcrest.Matchers; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/descriptor/parsers/SamlDescriptorIDPKeysExtractorTest.java b/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/descriptor/parsers/SamlDescriptorIDPKeysExtractorTest.java index ec6eaa4bc8f..3bf03682a7a 100644 --- a/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/descriptor/parsers/SamlDescriptorIDPKeysExtractorTest.java +++ b/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/descriptor/parsers/SamlDescriptorIDPKeysExtractorTest.java @@ -1,14 +1,16 @@ package org.keycloak.adapters.saml.descriptor.parsers; +import java.io.InputStream; + +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.saml.common.exceptions.ParsingException; + +import org.junit.Test; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.InputStream; -import org.junit.Test; -import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.saml.common.exceptions.ParsingException; - public class SamlDescriptorIDPKeysExtractorTest { @Test diff --git a/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/rotation/SamlDescriptorPublicKeyLocatorTest.java b/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/rotation/SamlDescriptorPublicKeyLocatorTest.java index 78ccb618bf3..be034847ac5 100644 --- a/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/rotation/SamlDescriptorPublicKeyLocatorTest.java +++ b/adapters/saml/core/src/test/java/org/keycloak/adapters/saml/rotation/SamlDescriptorPublicKeyLocatorTest.java @@ -16,9 +16,6 @@ */ package org.keycloak.adapters.saml.rotation; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; import java.io.IOException; import java.io.OutputStream; import java.io.StringWriter; @@ -34,18 +31,23 @@ import java.util.stream.StreamSupport; import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import org.apache.http.impl.client.HttpClients; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + import org.keycloak.common.util.Time; import org.keycloak.rotation.KeyLocator; import org.keycloak.saml.SPMetadataDescriptor; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.processing.core.util.XMLSignatureUtil; + +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; +import org.apache.http.impl.client.HttpClients; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; import org.w3c.dom.Element; /** diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/ElytronHttpFacade.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/ElytronHttpFacade.java index be12df83d80..e8455d902c8 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/ElytronHttpFacade.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/ElytronHttpFacade.java @@ -32,12 +32,10 @@ import java.util.Collection; import java.util.List; import java.util.function.Consumer; import java.util.regex.Pattern; - import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.cert.X509Certificate; -import org.jboss.logging.Logger; import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.adapters.saml.SamlDeploymentContext; import org.keycloak.adapters.saml.SamlSession; @@ -50,6 +48,8 @@ import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapperUpdater; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.UriUtils; + +import org.jboss.logging.Logger; import org.wildfly.security.auth.callback.AnonymousAuthorizationCallback; import org.wildfly.security.auth.callback.AuthenticationCompleteCallback; import org.wildfly.security.auth.callback.SecurityIdentityCallback; diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/ElytronSamlSessionStore.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/ElytronSamlSessionStore.java index 6dd6f0e7e37..46830703ecc 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/ElytronSamlSessionStore.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/ElytronSamlSessionStore.java @@ -22,8 +22,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; - -import org.jboss.logging.Logger; import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.adapters.saml.SamlSession; import org.keycloak.adapters.saml.SamlSessionStore; @@ -31,6 +29,8 @@ import org.keycloak.adapters.saml.SamlUtil; import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapperUpdater; import org.keycloak.common.util.KeycloakUriBuilder; + +import org.jboss.logging.Logger; import org.wildfly.security.http.HttpScope; import org.wildfly.security.http.Scope; diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java index 91abdb85145..d770c01281b 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/IdMapperUpdaterSessionListener.java @@ -16,16 +16,18 @@ */ package org.keycloak.adapters.saml.elytron; -import org.keycloak.adapters.saml.SamlSession; -import org.keycloak.adapters.spi.SessionIdMapper; - import java.util.Objects; + import jakarta.servlet.http.HttpSession; import jakarta.servlet.http.HttpSessionAttributeListener; import jakarta.servlet.http.HttpSessionBindingEvent; import jakarta.servlet.http.HttpSessionEvent; import jakarta.servlet.http.HttpSessionIdListener; import jakarta.servlet.http.HttpSessionListener; + +import org.keycloak.adapters.saml.SamlSession; +import org.keycloak.adapters.spi.SessionIdMapper; + import org.jboss.logging.Logger; /** diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java index 4fc84e87068..0eef48a5173 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakConfigurationServletListener.java @@ -21,12 +21,17 @@ import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Collection; +import java.util.LinkedList; +import java.util.Objects; import jakarta.servlet.ServletContext; import jakarta.servlet.ServletContextEvent; import jakarta.servlet.ServletContextListener; -import org.jboss.logging.Logger; import org.keycloak.adapters.saml.AdapterConstants; import org.keycloak.adapters.saml.DefaultSamlDeployment; import org.keycloak.adapters.saml.SamlConfigResolver; @@ -39,12 +44,8 @@ import org.keycloak.adapters.spi.InMemorySessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapperUpdater; import org.keycloak.saml.common.exceptions.ParsingException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.LinkedList; -import java.util.Objects; + +import org.jboss.logging.Logger; /** *

A {@link ServletContextListener} that parses the keycloak adapter configuration and set the same configuration diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java index 2d991dd82db..586ca53b9ec 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanism.java @@ -20,11 +20,10 @@ package org.keycloak.adapters.saml.elytron; import java.net.URI; import java.util.Map; import java.util.regex.Pattern; - import javax.security.auth.callback.CallbackHandler; + import jakarta.servlet.http.HttpServletResponse; -import org.jboss.logging.Logger; import org.keycloak.adapters.saml.SamlAuthenticator; import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.adapters.saml.SamlDeploymentContext; @@ -32,6 +31,8 @@ import org.keycloak.adapters.spi.AuthChallenge; import org.keycloak.adapters.spi.AuthOutcome; import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapperUpdater; + +import org.jboss.logging.Logger; import org.wildfly.security.http.HttpAuthenticationException; import org.wildfly.security.http.HttpScope; import org.wildfly.security.http.HttpServerAuthenticationMechanism; diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanismFactory.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanismFactory.java index 03b1c141041..c0da5b0bd76 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanismFactory.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakHttpServerAuthenticationMechanismFactory.java @@ -19,13 +19,13 @@ package org.keycloak.adapters.saml.elytron; import java.util.HashMap; import java.util.Map; - import javax.security.auth.callback.CallbackHandler; import org.keycloak.adapters.saml.SamlDeploymentContext; import org.keycloak.adapters.spi.InMemorySessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapper; import org.keycloak.adapters.spi.SessionIdMapperUpdater; + import org.wildfly.security.http.HttpAuthenticationException; import org.wildfly.security.http.HttpServerAuthenticationMechanism; import org.wildfly.security.http.HttpServerAuthenticationMechanismFactory; diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakSecurityRealm.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakSecurityRealm.java index f79b60d25e4..eb5d7e484f5 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakSecurityRealm.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/KeycloakSecurityRealm.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import org.keycloak.adapters.saml.SamlPrincipal; + import org.wildfly.security.auth.SupportLevel; import org.wildfly.security.auth.server.RealmIdentity; import org.wildfly.security.auth.server.RealmUnavailableException; diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/SecurityIdentityUtil.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/SecurityIdentityUtil.java index ce45db651b3..72fa163ce23 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/SecurityIdentityUtil.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/SecurityIdentityUtil.java @@ -19,13 +19,13 @@ package org.keycloak.adapters.saml.elytron; import java.io.IOException; import java.security.Principal; - import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.sasl.AuthorizeCallback; import org.keycloak.adapters.saml.SamlPrincipal; + import org.wildfly.security.auth.callback.AuthenticationCompleteCallback; import org.wildfly.security.auth.callback.EvidenceVerifyCallback; import org.wildfly.security.auth.callback.SecurityIdentityCallback; diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java index e18b65ed6f6..37420cc5092 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/InfinispanSessionCacheIdMapperUpdater.java @@ -16,6 +16,16 @@ */ package org.keycloak.adapters.saml.elytron.infinispan; +import java.util.Set; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import jakarta.servlet.ServletContext; + +import org.keycloak.adapters.saml.AdapterConstants; +import org.keycloak.adapters.spi.SessionIdMapper; +import org.keycloak.adapters.spi.SessionIdMapperUpdater; + import org.infinispan.Cache; import org.infinispan.configuration.cache.CacheMode; import org.infinispan.configuration.cache.Configuration; @@ -24,14 +34,6 @@ import org.infinispan.manager.EmbeddedCacheManager; import org.infinispan.persistence.manager.PersistenceManager; import org.infinispan.persistence.remote.RemoteStore; import org.jboss.logging.Logger; -import org.keycloak.adapters.saml.AdapterConstants; -import org.keycloak.adapters.spi.SessionIdMapper; -import org.keycloak.adapters.spi.SessionIdMapperUpdater; - -import javax.naming.InitialContext; -import javax.naming.NamingException; -import jakarta.servlet.ServletContext; -import java.util.Set; /** * diff --git a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/SsoSessionCacheListener.java b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/SsoSessionCacheListener.java index 9fd2282bb53..4f87d95d1dd 100644 --- a/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/SsoSessionCacheListener.java +++ b/adapters/saml/wildfly-elytron/src/main/java/org/keycloak/adapters/saml/elytron/infinispan/SsoSessionCacheListener.java @@ -16,14 +16,15 @@ */ package org.keycloak.adapters.saml.elytron.infinispan; -import org.keycloak.adapters.spi.SessionIdMapper; - import java.util.Queue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + +import org.keycloak.adapters.spi.SessionIdMapper; + import org.infinispan.Cache; import org.infinispan.client.hotrod.annotation.ClientCacheEntryCreated; import org.infinispan.client.hotrod.annotation.ClientCacheEntryRemoved; diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/AllowedClockSkew.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/AllowedClockSkew.java index 455fe113eb8..bf10ceb051b 100644 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/AllowedClockSkew.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/AllowedClockSkew.java @@ -17,6 +17,7 @@ package org.keycloak.subsystem.adapter.saml.extension; import java.util.EnumSet; + import org.jboss.as.controller.SimpleAttributeDefinition; import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; import org.jboss.as.controller.operations.validation.EnumValidator; diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/Constants.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/Constants.java index 2e8ea93244f..1fd3ea813a6 100755 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/Constants.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/Constants.java @@ -180,5 +180,3 @@ public class Constants { static final String CONNECTION_TTL = "connectionTtl"; } } - - diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/IdentityProviderDefinition.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/IdentityProviderDefinition.java index 9f94f5346b8..4ecd736ff97 100644 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/IdentityProviderDefinition.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/IdentityProviderDefinition.java @@ -16,6 +16,8 @@ */ package org.keycloak.subsystem.adapter.saml.extension; +import java.util.HashMap; + import org.jboss.as.controller.AttributeDefinition; import org.jboss.as.controller.ObjectTypeAttributeDefinition; import org.jboss.as.controller.OperationStepHandler; @@ -29,8 +31,6 @@ import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler import org.jboss.as.controller.registry.ManagementResourceRegistration; import org.jboss.dmr.ModelType; -import java.util.HashMap; - /** * @author Marko Strukelj */ diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyDefinition.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyDefinition.java index 95b84c535ec..323e3b14fd9 100755 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyDefinition.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyDefinition.java @@ -16,6 +16,8 @@ */ package org.keycloak.subsystem.adapter.saml.extension; +import java.util.HashMap; + import org.jboss.as.controller.AttributeDefinition; import org.jboss.as.controller.ObjectTypeAttributeDefinition; import org.jboss.as.controller.OperationStepHandler; @@ -29,8 +31,6 @@ import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler import org.jboss.as.controller.registry.ManagementResourceRegistration; import org.jboss.dmr.ModelType; -import java.util.HashMap; - /** * @author Marko Strukelj */ diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyStoreDefinition.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyStoreDefinition.java index 892aa14d95c..fea811ca424 100644 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyStoreDefinition.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyStoreDefinition.java @@ -16,12 +16,12 @@ */ package org.keycloak.subsystem.adapter.saml.extension; +import java.util.HashMap; + import org.jboss.as.controller.SimpleAttributeDefinition; import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; import org.jboss.dmr.ModelType; -import java.util.HashMap; - /** * @author Marko Strukelj */ diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyStorePrivateKeyDefinition.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyStorePrivateKeyDefinition.java index 0f90a291a50..525221cc292 100644 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyStorePrivateKeyDefinition.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeyStorePrivateKeyDefinition.java @@ -16,12 +16,12 @@ */ package org.keycloak.subsystem.adapter.saml.extension; +import java.util.HashMap; + import org.jboss.as.controller.SimpleAttributeDefinition; import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; import org.jboss.dmr.ModelType; -import java.util.HashMap; - /** * @author Marko Strukelj */ diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakAdapterConfigDeploymentProcessor.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakAdapterConfigDeploymentProcessor.java index 05c41eefc54..1936146e228 100755 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakAdapterConfigDeploymentProcessor.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakAdapterConfigDeploymentProcessor.java @@ -17,7 +17,16 @@ package org.keycloak.subsystem.adapter.saml.extension; -import static org.keycloak.subsystem.adapter.saml.extension.Elytron.isElytronEnabled; +import java.io.ByteArrayOutputStream; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamException; + +import org.keycloak.adapters.saml.AdapterConstants; +import org.keycloak.adapters.saml.elytron.KeycloakConfigurationServletListener; +import org.keycloak.subsystem.adapter.saml.extension.logging.KeycloakLogger; import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.DeploymentUnit; @@ -31,16 +40,8 @@ import org.jboss.metadata.web.spec.ListenerMetaData; import org.jboss.metadata.web.spec.LoginConfigMetaData; import org.jboss.staxmapper.FormattingXMLStreamWriter; import org.jboss.staxmapper.XMLExtendedStreamWriter; -import org.keycloak.adapters.saml.AdapterConstants; -import org.keycloak.adapters.saml.elytron.KeycloakConfigurationServletListener; -import org.keycloak.subsystem.adapter.saml.extension.logging.KeycloakLogger; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamException; -import java.io.ByteArrayOutputStream; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; +import static org.keycloak.subsystem.adapter.saml.extension.Elytron.isElytronEnabled; /** * Pass authentication data (keycloak.json) as a servlet context param so it can be read by the KeycloakServletExtension. diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakClusteredSsoDeploymentProcessor.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakClusteredSsoDeploymentProcessor.java index 47c5b98c081..ff023ef17a6 100644 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakClusteredSsoDeploymentProcessor.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakClusteredSsoDeploymentProcessor.java @@ -16,10 +16,12 @@ */ package org.keycloak.subsystem.adapter.saml.extension; -import org.keycloak.adapters.saml.AdapterConstants; import java.util.ArrayList; import java.util.List; import java.util.Objects; + +import org.keycloak.adapters.saml.AdapterConstants; + import org.jboss.as.controller.capability.CapabilityServiceSupport; import org.jboss.as.server.deployment.Attachments; import org.jboss.as.server.deployment.DeploymentPhaseContext; diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java index 87d54e31f48..8a9c896677c 100755 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakDependencyProcessorWildFly.java @@ -17,14 +17,14 @@ package org.keycloak.subsystem.adapter.saml.extension; -import static org.keycloak.subsystem.adapter.saml.extension.Elytron.isElytronEnabled; - import org.jboss.as.server.deployment.DeploymentPhaseContext; import org.jboss.as.server.deployment.module.ModuleDependency; import org.jboss.as.server.deployment.module.ModuleSpecification; import org.jboss.modules.ModuleClassLoader; import org.jboss.modules.ModuleLoader; +import static org.keycloak.subsystem.adapter.saml.extension.Elytron.isElytronEnabled; + /** * Add platform-specific modules for WildFly. * diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakSubsystemParser.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakSubsystemParser.java index 4cf90c4d764..73325cbc874 100755 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakSubsystemParser.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/KeycloakSubsystemParser.java @@ -16,6 +16,14 @@ */ package org.keycloak.subsystem.adapter.saml.extension; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; + import org.jboss.as.controller.PathAddress; import org.jboss.as.controller.PathElement; import org.jboss.as.controller.SimpleAttributeDefinition; @@ -30,14 +38,6 @@ import org.jboss.staxmapper.XMLElementWriter; import org.jboss.staxmapper.XMLExtendedStreamReader; import org.jboss.staxmapper.XMLExtendedStreamWriter; -import javax.xml.stream.XMLStreamConstants; -import javax.xml.stream.XMLStreamException; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - /** * The subsystem parser, which uses stax to read and write to and from xml */ diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/ServiceProviderDefinition.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/ServiceProviderDefinition.java index 773bf61a8ee..849abe4ec9a 100755 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/ServiceProviderDefinition.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/ServiceProviderDefinition.java @@ -16,6 +16,10 @@ */ package org.keycloak.subsystem.adapter.saml.extension; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; + import org.jboss.as.controller.AttributeDefinition; import org.jboss.as.controller.AttributeMarshallers; import org.jboss.as.controller.ListAttributeDefinition; @@ -32,10 +36,6 @@ import org.jboss.as.controller.operations.common.GenericSubsystemDescribeHandler import org.jboss.as.controller.registry.ManagementResourceRegistration; import org.jboss.dmr.ModelType; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; - /** * @author Marko Strukelj */ diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/SingleLogoutDefinition.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/SingleLogoutDefinition.java index 50e6353d15b..73547b7fe0c 100644 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/SingleLogoutDefinition.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/SingleLogoutDefinition.java @@ -16,12 +16,12 @@ */ package org.keycloak.subsystem.adapter.saml.extension; +import java.util.HashMap; + import org.jboss.as.controller.SimpleAttributeDefinition; import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; import org.jboss.dmr.ModelType; -import java.util.HashMap; - /** * @author Marko Strukelj */ diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/SingleSignOnDefinition.java b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/SingleSignOnDefinition.java index d04c3820e26..44629e5a5f5 100644 --- a/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/SingleSignOnDefinition.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/main/java/org/keycloak/subsystem/adapter/saml/extension/SingleSignOnDefinition.java @@ -16,12 +16,12 @@ */ package org.keycloak.subsystem.adapter.saml.extension; +import java.util.HashMap; + import org.jboss.as.controller.SimpleAttributeDefinition; import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; import org.jboss.dmr.ModelType; -import java.util.HashMap; - /** * @author Marko Strukelj */ diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/saml/extension/SubsystemParsingAllowedClockSkewTestCase.java b/adapters/saml/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/saml/extension/SubsystemParsingAllowedClockSkewTestCase.java index 22144881ec4..795bd333683 100755 --- a/adapters/saml/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/saml/extension/SubsystemParsingAllowedClockSkewTestCase.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/saml/extension/SubsystemParsingAllowedClockSkewTestCase.java @@ -16,8 +16,6 @@ */ package org.keycloak.subsystem.adapter.saml.extension; -import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest; - import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; @@ -36,11 +34,13 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; + import org.jboss.as.controller.ExpressionResolver; import org.jboss.as.controller.PathAddress; import org.jboss.as.controller.PathElement; import org.jboss.as.controller.descriptions.ModelDescriptionConstants; import org.jboss.as.model.test.ModelTestUtils; +import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest; import org.jboss.as.subsystem.test.KernelServices; import org.jboss.dmr.ModelNode; import org.junit.Assert; diff --git a/adapters/saml/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/saml/extension/SubsystemParsingTestCase.java b/adapters/saml/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/saml/extension/SubsystemParsingTestCase.java index ff8089f46a2..05936b2c617 100755 --- a/adapters/saml/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/saml/extension/SubsystemParsingTestCase.java +++ b/adapters/saml/wildfly/wildfly-subsystem/src/test/java/org/keycloak/subsystem/adapter/saml/extension/SubsystemParsingTestCase.java @@ -16,21 +16,9 @@ */ package org.keycloak.subsystem.adapter.saml.extension; -import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -46,6 +34,17 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import org.jboss.as.subsystem.test.AbstractSubsystemBaseTest; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + /** * Tests all management expects for subsystem, parsing, marshaling, model definition and other diff --git a/adapters/spi/adapter-spi/src/main/java/org/keycloak/adapters/spi/HttpFacade.java b/adapters/spi/adapter-spi/src/main/java/org/keycloak/adapters/spi/HttpFacade.java index 0636ebc1e80..29a03efc50c 100755 --- a/adapters/spi/adapter-spi/src/main/java/org/keycloak/adapters/spi/HttpFacade.java +++ b/adapters/spi/adapter-spi/src/main/java/org/keycloak/adapters/spi/HttpFacade.java @@ -17,10 +17,10 @@ package org.keycloak.adapters.spi; -import javax.security.cert.X509Certificate; import java.io.InputStream; import java.io.OutputStream; import java.util.List; +import javax.security.cert.X509Certificate; /** * @author Bill Burke diff --git a/adapters/spi/adapter-spi/src/main/java/org/keycloak/adapters/spi/InMemorySessionIdMapper.java b/adapters/spi/adapter-spi/src/main/java/org/keycloak/adapters/spi/InMemorySessionIdMapper.java index dfbe8462104..9fabeac4760 100755 --- a/adapters/spi/adapter-spi/src/main/java/org/keycloak/adapters/spi/InMemorySessionIdMapper.java +++ b/adapters/spi/adapter-spi/src/main/java/org/keycloak/adapters/spi/InMemorySessionIdMapper.java @@ -21,6 +21,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; + import org.jboss.logging.Logger; /** diff --git a/adapters/spi/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java b/adapters/spi/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java index ac2ba35ed04..9f0bab6e833 100755 --- a/adapters/spi/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java +++ b/adapters/spi/jboss-adapter-core/src/main/java/org/keycloak/adapters/jboss/KeycloakLoginModule.java @@ -17,20 +17,21 @@ package org.keycloak.adapters.jboss; +import java.io.IOException; +import java.security.Principal; +import java.util.Set; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.login.LoginException; + +import org.keycloak.adapters.spi.KeycloakAccount; + import org.jboss.logging.Logger; 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.spi.KeycloakAccount; - -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.NameCallback; -import javax.security.auth.callback.UnsupportedCallbackException; -import javax.security.auth.login.LoginException; -import java.io.IOException; -import java.security.Principal; -import java.util.Set; /** * @author Bill Burke diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/AuthzClient.java b/authz/client/src/main/java/org/keycloak/authorization/client/AuthzClient.java index 58706b7e2de..7f903a0fc56 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/AuthzClient.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/AuthzClient.java @@ -17,13 +17,9 @@ */ package org.keycloak.authorization.client; -import static org.keycloak.constants.ServiceUrlConstants.AUTHZ_DISCOVERY_URL; - import java.io.IOException; import java.io.InputStream; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.ObjectMapper; import org.keycloak.authorization.client.representation.ServerConfiguration; import org.keycloak.authorization.client.resource.AuthorizationResource; import org.keycloak.authorization.client.resource.ProtectionResource; @@ -33,6 +29,11 @@ import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.representations.AccessTokenResponse; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.ObjectMapper; + +import static org.keycloak.constants.ServiceUrlConstants.AUTHZ_DISCOVERY_URL; + /** *

This is class serves as an entry point for clients looking for access to Keycloak Authorization Services. * diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/Configuration.java b/authz/client/src/main/java/org/keycloak/authorization/client/Configuration.java index 3186435cf75..75993fd5ca5 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/Configuration.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/Configuration.java @@ -19,13 +19,14 @@ package org.keycloak.authorization.client; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.HttpClients; import org.keycloak.protocol.oidc.client.authentication.ClientCredentialsProvider; import org.keycloak.protocol.oidc.client.authentication.ClientCredentialsProviderUtils; import org.keycloak.representations.adapters.config.AdapterConfig; +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.apache.http.client.HttpClient; +import org.apache.http.impl.client.HttpClients; + /** * @author Pedro Igor */ diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/SystemPropertiesJsonParserFactory.java b/authz/client/src/main/java/org/keycloak/authorization/client/SystemPropertiesJsonParserFactory.java index 339b35f45b0..5661010389b 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/SystemPropertiesJsonParserFactory.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/SystemPropertiesJsonParserFactory.java @@ -21,12 +21,13 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; +import org.keycloak.common.util.StringPropertyReplacer; +import org.keycloak.common.util.SystemEnvProperties; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.io.IOContext; import com.fasterxml.jackson.core.util.JsonParserDelegate; import com.fasterxml.jackson.databind.MappingJsonFactory; -import org.keycloak.common.util.StringPropertyReplacer; -import org.keycloak.common.util.SystemEnvProperties; /** * Provides replacing of system properties for parsed values diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/representation/TokenIntrospectionResponse.java b/authz/client/src/main/java/org/keycloak/authorization/client/representation/TokenIntrospectionResponse.java index 8bd0424322e..4cc956412f3 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/representation/TokenIntrospectionResponse.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/representation/TokenIntrospectionResponse.java @@ -19,10 +19,11 @@ package org.keycloak.authorization.client.representation; import java.util.List; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.representations.JsonWebToken; import org.keycloak.representations.idm.authorization.Permission; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Pedro Igor */ diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/resource/AuthorizationResource.java b/authz/client/src/main/java/org/keycloak/authorization/client/resource/AuthorizationResource.java index c613b4855a2..2530b495238 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/resource/AuthorizationResource.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/resource/AuthorizationResource.java @@ -32,6 +32,7 @@ import org.keycloak.authorization.client.util.TokenCallable; import org.keycloak.representations.idm.authorization.AuthorizationRequest; import org.keycloak.representations.idm.authorization.AuthorizationResponse; import org.keycloak.representations.idm.authorization.Permission; + import com.fasterxml.jackson.core.type.TypeReference; /** diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/resource/PermissionResource.java b/authz/client/src/main/java/org/keycloak/authorization/client/resource/PermissionResource.java index 72d49763b96..3b42e44a88f 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/resource/PermissionResource.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/resource/PermissionResource.java @@ -21,7 +21,6 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.Callable; -import com.fasterxml.jackson.core.type.TypeReference; import org.keycloak.authorization.client.representation.ServerConfiguration; import org.keycloak.authorization.client.util.Http; import org.keycloak.authorization.client.util.Throwables; @@ -31,6 +30,8 @@ import org.keycloak.representations.idm.authorization.PermissionResponse; import org.keycloak.representations.idm.authorization.PermissionTicketRepresentation; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.core.type.TypeReference; + /** * An entry point for managing permission tickets using the Protection API. * diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/resource/PolicyResource.java b/authz/client/src/main/java/org/keycloak/authorization/client/resource/PolicyResource.java index e5438d3357d..006d7efb23a 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/resource/PolicyResource.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/resource/PolicyResource.java @@ -19,13 +19,15 @@ package org.keycloak.authorization.client.resource; import java.util.List; import java.util.concurrent.Callable; -import com.fasterxml.jackson.core.type.TypeReference; import org.keycloak.authorization.client.representation.ServerConfiguration; import org.keycloak.authorization.client.util.Http; import org.keycloak.authorization.client.util.Throwables; import org.keycloak.authorization.client.util.TokenCallable; import org.keycloak.representations.idm.authorization.UmaPermissionRepresentation; import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.type.TypeReference; + import static org.keycloak.common.util.Encode.encodePathAsIs; /** diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/resource/ProtectedResource.java b/authz/client/src/main/java/org/keycloak/authorization/client/resource/ProtectedResource.java index 97d05ffdd9a..a034acab98b 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/resource/ProtectedResource.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/resource/ProtectedResource.java @@ -20,7 +20,6 @@ package org.keycloak.authorization.client.resource; import java.util.List; import java.util.concurrent.Callable; -import com.fasterxml.jackson.core.type.TypeReference; import org.keycloak.authorization.client.Configuration; import org.keycloak.authorization.client.representation.ServerConfiguration; import org.keycloak.authorization.client.util.Http; @@ -29,6 +28,9 @@ import org.keycloak.authorization.client.util.Throwables; import org.keycloak.authorization.client.util.TokenCallable; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.type.TypeReference; + import static org.keycloak.common.util.Encode.encodePathAsIs; /** diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/util/Http.java b/authz/client/src/main/java/org/keycloak/authorization/client/util/Http.java index e1b43c0004d..694c7a2e39e 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/util/Http.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/util/Http.java @@ -17,10 +17,11 @@ */ package org.keycloak.authorization.client.util; -import org.apache.http.client.methods.RequestBuilder; import org.keycloak.authorization.client.Configuration; import org.keycloak.protocol.oidc.client.authentication.ClientCredentialsProvider; +import org.apache.http.client.methods.RequestBuilder; + /** * @author Pedro Igor */ diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethod.java b/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethod.java index c3b08616528..4d7cb37b012 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethod.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethod.java @@ -25,6 +25,9 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; +import org.keycloak.authorization.client.Configuration; +import org.keycloak.protocol.oidc.client.authentication.ClientCredentialsProvider; + import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; @@ -35,8 +38,6 @@ import org.apache.http.client.methods.RequestBuilder; import org.apache.http.entity.ByteArrayEntity; import org.apache.http.message.BasicNameValuePair; import org.apache.http.util.EntityUtils; -import org.keycloak.authorization.client.Configuration; -import org.keycloak.protocol.oidc.client.authentication.ClientCredentialsProvider; /** * @author Pedro Igor diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodAuthenticator.java b/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodAuthenticator.java index 8e928bb188b..1fce7f0e6b4 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodAuthenticator.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodAuthenticator.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.http.Header; import org.keycloak.OAuth2Constants; import org.keycloak.protocol.oidc.client.authentication.ClientCredentialsProvider; import org.keycloak.protocol.oidc.client.authentication.ClientCredentialsProviderUtils; @@ -33,6 +32,8 @@ import org.keycloak.representations.idm.authorization.AuthorizationRequest.Metad import org.keycloak.representations.idm.authorization.Permission; import org.keycloak.representations.idm.authorization.PermissionTicketToken; +import org.apache.http.Header; + /** * @author Pedro Igor */ diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodResponse.java b/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodResponse.java index 7cfba8ef0bd..38f6578e746 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodResponse.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/util/HttpMethodResponse.java @@ -20,9 +20,10 @@ package org.keycloak.authorization.client.util; import java.io.ByteArrayInputStream; import java.io.IOException; -import com.fasterxml.jackson.core.type.TypeReference; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.core.type.TypeReference; + /** * @author Pedro Igor */ diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/util/TokenCallable.java b/authz/client/src/main/java/org/keycloak/authorization/client/util/TokenCallable.java index dca3d673b73..0c71f0eb447 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/util/TokenCallable.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/util/TokenCallable.java @@ -18,7 +18,6 @@ package org.keycloak.authorization.client.util; import java.util.concurrent.Callable; -import org.jboss.logging.Logger; import org.keycloak.authorization.client.Configuration; import org.keycloak.authorization.client.representation.ServerConfiguration; import org.keycloak.common.util.Time; @@ -28,6 +27,8 @@ import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.RefreshToken; import org.keycloak.util.JsonSerialization; +import org.jboss.logging.Logger; + public class TokenCallable implements Callable { private static Logger log = Logger.getLogger(TokenCallable.class); diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/ASN1Decoder.java b/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/ASN1Decoder.java index 01ea3bc4191..5a195214f8e 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/ASN1Decoder.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/ASN1Decoder.java @@ -200,4 +200,3 @@ class ASN1Decoder { return tmp; } } - diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/ASN1Encoder.java b/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/ASN1Encoder.java index 2bfda3a76bd..1500d4928d0 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/ASN1Encoder.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/ASN1Encoder.java @@ -98,4 +98,3 @@ class ASN1Encoder { return tmp.toByteArray(); } } - diff --git a/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/AuthzClientCryptoProvider.java b/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/AuthzClientCryptoProvider.java index 90c9c813826..fdbc9282596 100644 --- a/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/AuthzClientCryptoProvider.java +++ b/authz/client/src/main/java/org/keycloak/authorization/client/util/crypto/AuthzClientCryptoProvider.java @@ -43,6 +43,7 @@ import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; import javax.crypto.SecretKeyFactory; import javax.net.ssl.SSLSocketFactory; + import org.keycloak.common.crypto.CertificateUtilsProvider; import org.keycloak.common.crypto.CryptoProvider; import org.keycloak.common.crypto.ECDSACryptoProvider; diff --git a/authz/client/src/test/java/org/keycloak/authorization/client/JsonParserTest.java b/authz/client/src/test/java/org/keycloak/authorization/client/JsonParserTest.java index 90d6170c08c..439e007e2dd 100755 --- a/authz/client/src/test/java/org/keycloak/authorization/client/JsonParserTest.java +++ b/authz/client/src/test/java/org/keycloak/authorization/client/JsonParserTest.java @@ -20,10 +20,11 @@ package org.keycloak.authorization.client; import java.io.IOException; import java.io.InputStream; +import org.keycloak.representations.adapters.config.AdapterConfig; + import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Test; -import org.keycloak.representations.adapters.config.AdapterConfig; /** * @author Marek Posolda diff --git a/authz/client/src/test/java/org/keycloak/authorization/client/test/ECDSAAlgorithmTest.java b/authz/client/src/test/java/org/keycloak/authorization/client/test/ECDSAAlgorithmTest.java index 01d8a7ce6e4..442cafcf17b 100644 --- a/authz/client/src/test/java/org/keycloak/authorization/client/test/ECDSAAlgorithmTest.java +++ b/authz/client/src/test/java/org/keycloak/authorization/client/test/ECDSAAlgorithmTest.java @@ -24,12 +24,13 @@ import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.Signature; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.authorization.client.util.crypto.AuthzClientCryptoProvider; import org.keycloak.crypto.ECDSAAlgorithm; import org.keycloak.crypto.JavaAlgorithm; +import org.junit.Assert; +import org.junit.Test; + /** * * @author rmartinc @@ -71,4 +72,3 @@ public class ECDSAAlgorithmTest { test(ECDSAAlgorithm.ES512); } } - diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/aggregated/AggregatePolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/aggregated/AggregatePolicyProvider.java index 6ed937aa1cb..9ba56e45ae4 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/aggregated/AggregatePolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/aggregated/AggregatePolicyProvider.java @@ -20,7 +20,6 @@ package org.keycloak.authorization.policy.provider.aggregated; import java.util.HashMap; import java.util.Map; -import org.jboss.logging.Logger; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.Decision; import org.keycloak.authorization.model.Policy; @@ -31,6 +30,8 @@ import org.keycloak.authorization.policy.evaluation.Evaluation; import org.keycloak.authorization.policy.evaluation.Result; import org.keycloak.authorization.policy.provider.PolicyProvider; +import org.jboss.logging.Logger; + /** * @author Pedro Igor */ diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/client/ClientPolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/client/ClientPolicyProvider.java index 87680a34a65..81b12154ce9 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/client/ClientPolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/client/ClientPolicyProvider.java @@ -2,7 +2,6 @@ package org.keycloak.authorization.policy.provider.client; import java.util.function.BiFunction; -import org.jboss.logging.Logger; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.policy.evaluation.Evaluation; @@ -12,6 +11,8 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; +import org.jboss.logging.Logger; + public class ClientPolicyProvider implements PolicyProvider { private static final Logger logger = Logger.getLogger(ClientPolicyProvider.class); diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/client/ClientPolicyProviderFactory.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/client/ClientPolicyProviderFactory.java index 15ada99cd94..a901ddfa1a4 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/client/ClientPolicyProviderFactory.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/client/ClientPolicyProviderFactory.java @@ -37,10 +37,10 @@ import org.keycloak.authorization.store.PolicyStore; import org.keycloak.authorization.store.ResourceServerStore; import org.keycloak.authorization.store.StoreFactory; import org.keycloak.models.ClientModel; +import org.keycloak.models.ClientModel.ClientRemovedEvent; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; -import org.keycloak.models.ClientModel.ClientRemovedEvent; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.util.JsonSerialization; diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/clientscope/ClientScopePolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/clientscope/ClientScopePolicyProvider.java index 7cc555923bf..1a911940185 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/clientscope/ClientScopePolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/clientscope/ClientScopePolicyProvider.java @@ -20,7 +20,6 @@ package org.keycloak.authorization.policy.provider.clientscope; import java.util.Set; import java.util.function.BiFunction; -import org.jboss.logging.Logger; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.identity.Identity; import org.keycloak.authorization.model.Policy; @@ -30,6 +29,8 @@ import org.keycloak.models.ClientScopeModel; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.authorization.ClientScopePolicyRepresentation; +import org.jboss.logging.Logger; + /** * @author Yoshiyuki Tabata */ diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/group/GroupPolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/group/GroupPolicyProvider.java index 9813acc1252..1f445e651fe 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/group/GroupPolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/group/GroupPolicyProvider.java @@ -16,21 +16,18 @@ */ package org.keycloak.authorization.policy.provider.group; -import static org.keycloak.models.utils.ModelToRepresentation.buildGroupPath; - import java.util.List; import java.util.function.BiFunction; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.attribute.Attributes; import org.keycloak.authorization.attribute.Attributes.Entry; +import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluationPolicyProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.policy.evaluation.Evaluation; -import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluationPolicyProvider; import org.keycloak.authorization.policy.provider.PolicyProvider; import org.keycloak.authorization.store.PolicyStore; import org.keycloak.authorization.store.StoreFactory; @@ -43,6 +40,10 @@ import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.authorization.GroupPolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceType; +import org.jboss.logging.Logger; + +import static org.keycloak.models.utils.ModelToRepresentation.buildGroupPath; + /** * @author Pedro Igor */ diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/js/JSPolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/js/JSPolicyProvider.java index 97c3512ea36..637715aedf2 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/js/JSPolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/js/JSPolicyProvider.java @@ -18,17 +18,17 @@ package org.keycloak.authorization.policy.provider.js; import java.util.function.BiFunction; - import javax.script.ScriptContext; import javax.script.SimpleScriptContext; -import org.jboss.logging.Logger; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.policy.evaluation.Evaluation; import org.keycloak.authorization.policy.provider.PolicyProvider; import org.keycloak.scripting.EvaluatableScriptAdapter; +import org.jboss.logging.Logger; + /** * @author Pedro Igor */ diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/AbstractPermissionProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/AbstractPermissionProvider.java index 8d6aabdd16b..cf65d4a7ccd 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/AbstractPermissionProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/AbstractPermissionProvider.java @@ -16,7 +16,9 @@ */ package org.keycloak.authorization.policy.provider.permission; -import org.jboss.logging.Logger; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.Decision; import org.keycloak.authorization.model.Policy; @@ -25,8 +27,7 @@ import org.keycloak.authorization.policy.evaluation.DefaultEvaluation; import org.keycloak.authorization.policy.evaluation.Evaluation; import org.keycloak.authorization.policy.provider.PolicyProvider; -import java.util.HashMap; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Pedro Igor diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ResourcePolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ResourcePolicyProvider.java index b23d7a9d131..ca0cf957778 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ResourcePolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ResourcePolicyProvider.java @@ -16,15 +16,16 @@ */ package org.keycloak.authorization.policy.provider.permission; -import org.jboss.logging.Logger; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.authorization.Decision; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.permission.ResourcePermission; import org.keycloak.authorization.policy.evaluation.DefaultEvaluation; import org.keycloak.authorization.policy.evaluation.Evaluation; -import java.util.HashMap; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Pedro Igor diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ScopePolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ScopePolicyProvider.java index 1e1e3f66259..98074cf80e6 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ScopePolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ScopePolicyProvider.java @@ -16,15 +16,16 @@ */ package org.keycloak.authorization.policy.provider.permission; -import org.jboss.logging.Logger; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.authorization.Decision; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.permission.ResourcePermission; import org.keycloak.authorization.policy.evaluation.DefaultEvaluation; import org.keycloak.authorization.policy.evaluation.Evaluation; -import java.util.HashMap; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Pedro Igor diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ScopePolicyProviderFactory.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ScopePolicyProviderFactory.java index 4dc3eb6ccd7..6bbebbe92b4 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ScopePolicyProviderFactory.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/ScopePolicyProviderFactory.java @@ -16,9 +16,12 @@ */ package org.keycloak.authorization.policy.provider.permission; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.Config; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.policy.provider.PolicyProvider; import org.keycloak.authorization.policy.provider.PolicyProviderFactory; @@ -26,9 +29,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; -import java.util.HashMap; -import java.util.Map; - /** * @author Pedro Igor */ diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/UMAPolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/UMAPolicyProvider.java index 8aff7d9fc74..3044f0d5d00 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/UMAPolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/permission/UMAPolicyProvider.java @@ -16,12 +16,13 @@ */ package org.keycloak.authorization.policy.provider.permission; -import org.jboss.logging.Logger; import org.keycloak.authorization.identity.Identity; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.permission.ResourcePermission; import org.keycloak.authorization.policy.evaluation.Evaluation; +import org.jboss.logging.Logger; + /** * @author Pedro Igor */ diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/regex/RegexPolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/regex/RegexPolicyProvider.java index cb0b4ea790e..ae49094d1d8 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/regex/RegexPolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/regex/RegexPolicyProvider.java @@ -17,10 +17,6 @@ */ package org.keycloak.authorization.policy.provider.regex; -import static org.keycloak.utils.JsonUtils.getJsonValue; -import static org.keycloak.utils.JsonUtils.hasPath; -import static org.keycloak.utils.JsonUtils.splitClaimPath; - import java.io.IOException; import java.util.List; import java.util.Optional; @@ -28,7 +24,6 @@ import java.util.function.BiFunction; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jboss.logging.Logger; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.attribute.Attributes; import org.keycloak.authorization.model.Policy; @@ -36,7 +31,13 @@ import org.keycloak.authorization.policy.evaluation.Evaluation; import org.keycloak.authorization.policy.provider.PolicyProvider; import org.keycloak.representations.idm.authorization.RegexPolicyRepresentation; import org.keycloak.util.JsonSerialization; + import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; + +import static org.keycloak.utils.JsonUtils.getJsonValue; +import static org.keycloak.utils.JsonUtils.hasPath; +import static org.keycloak.utils.JsonUtils.splitClaimPath; /** * @author Yoshiyuki Tabata diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/role/RolePolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/role/RolePolicyProvider.java index 4d034255576..1e1a20b1c4e 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/role/RolePolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/role/RolePolicyProvider.java @@ -22,15 +22,14 @@ import java.util.Set; import java.util.function.BiFunction; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.attribute.Attributes.Entry; +import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluationPolicyProvider; import org.keycloak.authorization.identity.Identity; import org.keycloak.authorization.identity.UserModelIdentity; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.policy.evaluation.Evaluation; -import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluationPolicyProvider; import org.keycloak.authorization.policy.provider.PolicyProvider; import org.keycloak.authorization.store.PolicyStore; import org.keycloak.authorization.store.StoreFactory; @@ -44,6 +43,8 @@ import org.keycloak.representations.JsonWebToken; import org.keycloak.representations.idm.authorization.ResourceType; import org.keycloak.representations.idm.authorization.RolePolicyRepresentation; +import org.jboss.logging.Logger; + import static org.keycloak.models.utils.RoleUtils.getDeepUserRoleMappings; /** diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/role/RolePolicyProviderFactory.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/role/RolePolicyProviderFactory.java index bd66d0b478c..ab5ef5b8cbf 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/role/RolePolicyProviderFactory.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/role/RolePolicyProviderFactory.java @@ -17,6 +17,17 @@ package org.keycloak.authorization.policy.provider.role; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.Map; +import java.util.Set; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + import org.keycloak.Config; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; @@ -34,17 +45,6 @@ import org.keycloak.representations.idm.authorization.RolePolicyRepresentation.R import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - /** * @author Pedro Igor */ diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/time/TimePolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/time/TimePolicyProvider.java index 4725c04d814..1fee13d1121 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/time/TimePolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/time/TimePolicyProvider.java @@ -21,13 +21,14 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; -import org.jboss.logging.Logger; import org.keycloak.authorization.attribute.Attributes; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.policy.evaluation.Evaluation; import org.keycloak.authorization.policy.evaluation.EvaluationContext; import org.keycloak.authorization.policy.provider.PolicyProvider; +import org.jboss.logging.Logger; + /** * @author Pedro Igor */ diff --git a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/user/UserPolicyProvider.java b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/user/UserPolicyProvider.java index 5f75c26afa3..29b4a563751 100644 --- a/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/user/UserPolicyProvider.java +++ b/authz/policy/common/src/main/java/org/keycloak/authorization/policy/provider/user/UserPolicyProvider.java @@ -20,12 +20,11 @@ package org.keycloak.authorization.policy.provider.user; import java.util.function.BiFunction; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluationPolicyProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.policy.evaluation.Evaluation; -import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluationPolicyProvider; import org.keycloak.authorization.policy.provider.PolicyProvider; import org.keycloak.authorization.store.PolicyStore; import org.keycloak.authorization.store.StoreFactory; @@ -36,6 +35,8 @@ import org.keycloak.models.UserModel; import org.keycloak.representations.idm.authorization.ResourceType; import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; +import org.jboss.logging.Logger; + /** * @author Pedro Igor */ diff --git a/common/src/main/java/org/keycloak/common/Profile.java b/common/src/main/java/org/keycloak/common/Profile.java index 7bc62889d58..82e9c757abd 100755 --- a/common/src/main/java/org/keycloak/common/Profile.java +++ b/common/src/main/java/org/keycloak/common/Profile.java @@ -17,13 +17,6 @@ package org.keycloak.common; -import org.jboss.logging.Logger; -import org.keycloak.common.Profile.Feature.Type; -import org.keycloak.common.profile.ProfileConfigResolver; -import org.keycloak.common.profile.ProfileConfigResolver.FeatureConfig; -import org.keycloak.common.profile.ProfileException; -import org.keycloak.common.util.KerberosJdkProvider; - import java.util.Arrays; import java.util.Collections; import java.util.Comparator; @@ -38,6 +31,14 @@ import java.util.function.BooleanSupplier; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.keycloak.common.Profile.Feature.Type; +import org.keycloak.common.profile.ProfileConfigResolver; +import org.keycloak.common.profile.ProfileConfigResolver.FeatureConfig; +import org.keycloak.common.profile.ProfileException; +import org.keycloak.common.util.KerberosJdkProvider; + +import org.jboss.logging.Logger; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/common/src/main/java/org/keycloak/common/crypto/CryptoIntegration.java b/common/src/main/java/org/keycloak/common/crypto/CryptoIntegration.java index 1b51ad48dd4..8e7457bebdb 100644 --- a/common/src/main/java/org/keycloak/common/crypto/CryptoIntegration.java +++ b/common/src/main/java/org/keycloak/common/crypto/CryptoIntegration.java @@ -9,13 +9,13 @@ import java.util.ServiceLoader; import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; - import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.TrustManagerFactory; -import org.jboss.logging.Logger; import org.keycloak.common.util.BouncyIntegration; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/common/src/main/java/org/keycloak/common/crypto/CryptoProvider.java b/common/src/main/java/org/keycloak/common/crypto/CryptoProvider.java index 4755cbb9948..c9b72f9718f 100644 --- a/common/src/main/java/org/keycloak/common/crypto/CryptoProvider.java +++ b/common/src/main/java/org/keycloak/common/crypto/CryptoProvider.java @@ -16,7 +16,6 @@ import java.security.cert.CertificateFactory; import java.security.cert.CollectionCertStoreParameters; import java.security.spec.ECParameterSpec; import java.util.stream.Stream; - import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; import javax.crypto.SecretKeyFactory; diff --git a/common/src/main/java/org/keycloak/common/crypto/UserIdentityExtractorProvider.java b/common/src/main/java/org/keycloak/common/crypto/UserIdentityExtractorProvider.java index c393c3fbd5c..a6e19d43846 100644 --- a/common/src/main/java/org/keycloak/common/crypto/UserIdentityExtractorProvider.java +++ b/common/src/main/java/org/keycloak/common/crypto/UserIdentityExtractorProvider.java @@ -26,9 +26,10 @@ import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jboss.logging.Logger; import org.keycloak.common.util.PemUtils; +import org.jboss.logging.Logger; + /** * @author Peter Nalyvayko * @version $Revision: 1 $ diff --git a/common/src/main/java/org/keycloak/common/enums/SslRequired.java b/common/src/main/java/org/keycloak/common/enums/SslRequired.java index c928438ec20..89d001360ee 100644 --- a/common/src/main/java/org/keycloak/common/enums/SslRequired.java +++ b/common/src/main/java/org/keycloak/common/enums/SslRequired.java @@ -17,11 +17,11 @@ package org.keycloak.common.enums; -import org.keycloak.common.ClientConnection; - import java.net.InetAddress; import java.net.UnknownHostException; +import org.keycloak.common.ClientConnection; + /** * @author Stian Thorgersen */ diff --git a/common/src/main/java/org/keycloak/common/profile/CommaSeparatedListProfileConfigResolver.java b/common/src/main/java/org/keycloak/common/profile/CommaSeparatedListProfileConfigResolver.java index 9a113d7f495..9c6bc45225a 100644 --- a/common/src/main/java/org/keycloak/common/profile/CommaSeparatedListProfileConfigResolver.java +++ b/common/src/main/java/org/keycloak/common/profile/CommaSeparatedListProfileConfigResolver.java @@ -1,11 +1,11 @@ package org.keycloak.common.profile; -import org.keycloak.common.Profile; - import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import org.keycloak.common.Profile; + public class CommaSeparatedListProfileConfigResolver implements ProfileConfigResolver { private Set enabledFeatures; diff --git a/common/src/main/java/org/keycloak/common/profile/PropertiesProfileConfigResolver.java b/common/src/main/java/org/keycloak/common/profile/PropertiesProfileConfigResolver.java index 804582805a9..0442812de1e 100644 --- a/common/src/main/java/org/keycloak/common/profile/PropertiesProfileConfigResolver.java +++ b/common/src/main/java/org/keycloak/common/profile/PropertiesProfileConfigResolver.java @@ -1,11 +1,11 @@ package org.keycloak.common.profile; -import org.keycloak.common.Profile; -import org.keycloak.common.Profile.Feature; - import java.util.Properties; import java.util.function.UnaryOperator; +import org.keycloak.common.Profile; +import org.keycloak.common.Profile.Feature; + public class PropertiesProfileConfigResolver implements ProfileConfigResolver { private UnaryOperator getter; diff --git a/common/src/main/java/org/keycloak/common/profile/SingleProfileConfigResolver.java b/common/src/main/java/org/keycloak/common/profile/SingleProfileConfigResolver.java index 5f0b0ff7dec..304b4c81bb1 100644 --- a/common/src/main/java/org/keycloak/common/profile/SingleProfileConfigResolver.java +++ b/common/src/main/java/org/keycloak/common/profile/SingleProfileConfigResolver.java @@ -1,11 +1,11 @@ package org.keycloak.common.profile; -import org.keycloak.common.Profile; - import java.util.Collections; import java.util.Map; import java.util.Optional; +import org.keycloak.common.Profile; + // Features configuration based on the option 'feature-' public class SingleProfileConfigResolver implements ProfileConfigResolver { private final Map features; diff --git a/common/src/main/java/org/keycloak/common/util/BouncyIntegration.java b/common/src/main/java/org/keycloak/common/util/BouncyIntegration.java index 3e120d2b43c..54e21f4c3b0 100755 --- a/common/src/main/java/org/keycloak/common/util/BouncyIntegration.java +++ b/common/src/main/java/org/keycloak/common/util/BouncyIntegration.java @@ -17,11 +17,11 @@ package org.keycloak.common.util; -import org.keycloak.common.crypto.CryptoIntegration; - import java.security.Provider; import java.security.Security; +import org.keycloak.common.crypto.CryptoIntegration; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/common/src/main/java/org/keycloak/common/util/DelegatingSerializationFilter.java b/common/src/main/java/org/keycloak/common/util/DelegatingSerializationFilter.java index 6f82aa14796..2906c9f53eb 100644 --- a/common/src/main/java/org/keycloak/common/util/DelegatingSerializationFilter.java +++ b/common/src/main/java/org/keycloak/common/util/DelegatingSerializationFilter.java @@ -17,8 +17,6 @@ */ package org.keycloak.common.util; -import org.jboss.logging.Logger; - import java.io.ObjectInputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -27,6 +25,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.jboss.logging.Logger; + public class DelegatingSerializationFilter { private static final Logger LOG = Logger.getLogger(DelegatingSerializationFilter.class.getName()); diff --git a/common/src/main/java/org/keycloak/common/util/EnvUtil.java b/common/src/main/java/org/keycloak/common/util/EnvUtil.java index b7b41c739fc..0a6b1785be7 100755 --- a/common/src/main/java/org/keycloak/common/util/EnvUtil.java +++ b/common/src/main/java/org/keycloak/common/util/EnvUtil.java @@ -52,5 +52,3 @@ public final class EnvUtil { return buf.toString(); } } - - diff --git a/common/src/main/java/org/keycloak/common/util/FindFile.java b/common/src/main/java/org/keycloak/common/util/FindFile.java index 3f1ff3f41fd..b55774fe3e5 100755 --- a/common/src/main/java/org/keycloak/common/util/FindFile.java +++ b/common/src/main/java/org/keycloak/common/util/FindFile.java @@ -17,12 +17,12 @@ package org.keycloak.common.util; -import org.keycloak.common.constants.GenericConstants; - import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.InputStream; +import org.keycloak.common.constants.GenericConstants; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/common/src/main/java/org/keycloak/common/util/KerberosJdkProvider.java b/common/src/main/java/org/keycloak/common/util/KerberosJdkProvider.java index d152e4a605d..a882b690114 100644 --- a/common/src/main/java/org/keycloak/common/util/KerberosJdkProvider.java +++ b/common/src/main/java/org/keycloak/common/util/KerberosJdkProvider.java @@ -17,18 +17,6 @@ package org.keycloak.common.util; -import org.ietf.jgss.GSSCredential; -import org.ietf.jgss.GSSManager; -import org.ietf.jgss.GSSName; -import org.ietf.jgss.Oid; -import org.jboss.logging.Logger; -import org.keycloak.common.constants.KerberosConstants; - -import javax.security.auth.Subject; -import javax.security.auth.kerberos.KerberosPrincipal; -import javax.security.auth.kerberos.KerberosTicket; -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.Configuration; import java.io.File; import java.lang.reflect.Method; import java.net.MalformedURLException; @@ -40,6 +28,19 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import javax.security.auth.Subject; +import javax.security.auth.kerberos.KerberosPrincipal; +import javax.security.auth.kerberos.KerberosTicket; +import javax.security.auth.login.AppConfigurationEntry; +import javax.security.auth.login.Configuration; + +import org.keycloak.common.constants.KerberosConstants; + +import org.ietf.jgss.GSSCredential; +import org.ietf.jgss.GSSManager; +import org.ietf.jgss.GSSName; +import org.ietf.jgss.Oid; +import org.jboss.logging.Logger; /** * Provides abstraction to handle differences between various JDK vendors (Sun, IBM) diff --git a/common/src/main/java/org/keycloak/common/util/KerberosSerializationUtils.java b/common/src/main/java/org/keycloak/common/util/KerberosSerializationUtils.java index 887d5cc6688..200bd205917 100644 --- a/common/src/main/java/org/keycloak/common/util/KerberosSerializationUtils.java +++ b/common/src/main/java/org/keycloak/common/util/KerberosSerializationUtils.java @@ -17,10 +17,6 @@ package org.keycloak.common.util; -import org.ietf.jgss.GSSCredential; - -import javax.security.auth.kerberos.KerberosPrincipal; -import javax.security.auth.kerberos.KerberosTicket; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,6 +25,10 @@ import java.io.ObjectOutput; import java.io.ObjectOutputStream; import java.io.Serializable; import java.net.InetAddress; +import javax.security.auth.kerberos.KerberosPrincipal; +import javax.security.auth.kerberos.KerberosTicket; + +import org.ietf.jgss.GSSCredential; /** * Provides serialization/deserialization of kerberos {@link org.ietf.jgss.GSSCredential}, so it can be transmitted from auth-server to the application diff --git a/common/src/main/java/org/keycloak/common/util/KeyUtils.java b/common/src/main/java/org/keycloak/common/util/KeyUtils.java index 0cbc2c690bb..14d49b5f909 100644 --- a/common/src/main/java/org/keycloak/common/util/KeyUtils.java +++ b/common/src/main/java/org/keycloak/common/util/KeyUtils.java @@ -27,7 +27,6 @@ import java.security.PrivateKey; import java.security.PublicKey; import java.security.interfaces.RSAPrivateCrtKey; import java.security.spec.RSAPublicKeySpec; - import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; diff --git a/common/src/main/java/org/keycloak/common/util/KeystoreUtil.java b/common/src/main/java/org/keycloak/common/util/KeystoreUtil.java index ddffaf75d9e..ab86f89341f 100755 --- a/common/src/main/java/org/keycloak/common/util/KeystoreUtil.java +++ b/common/src/main/java/org/keycloak/common/util/KeystoreUtil.java @@ -17,9 +17,6 @@ package org.keycloak.common.util; -import org.keycloak.common.constants.GenericConstants; -import org.keycloak.common.crypto.CryptoIntegration; - import java.io.File; import java.io.FileInputStream; import java.io.InputStream; @@ -31,6 +28,9 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; +import org.keycloak.common.constants.GenericConstants; +import org.keycloak.common.crypto.CryptoIntegration; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java b/common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java index 7fc27db95e4..7302523b8ea 100644 --- a/common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java +++ b/common/src/main/java/org/keycloak/common/util/MimeTypeUtil.java @@ -17,9 +17,10 @@ package org.keycloak.common.util; -import jakarta.activation.MimetypesFileTypeMap; import java.io.File; +import jakarta.activation.MimetypesFileTypeMap; + /** * @author Stian Thorgersen */ diff --git a/common/src/main/java/org/keycloak/common/util/PathMatcher.java b/common/src/main/java/org/keycloak/common/util/PathMatcher.java index 94e87dd47ed..c88b8fdd19c 100644 --- a/common/src/main/java/org/keycloak/common/util/PathMatcher.java +++ b/common/src/main/java/org/keycloak/common/util/PathMatcher.java @@ -262,4 +262,3 @@ public abstract class PathMatcher

{ return entry; } } - diff --git a/common/src/main/java/org/keycloak/common/util/StackUtil.java b/common/src/main/java/org/keycloak/common/util/StackUtil.java index 90842fae2ee..c8c085eadfb 100644 --- a/common/src/main/java/org/keycloak/common/util/StackUtil.java +++ b/common/src/main/java/org/keycloak/common/util/StackUtil.java @@ -2,6 +2,7 @@ package org.keycloak.common.util; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; + import org.jboss.logging.Logger; /** diff --git a/common/src/test/java/org/keycloak/common/ProfileTest.java b/common/src/test/java/org/keycloak/common/ProfileTest.java index d68b4a2d7f0..d3b49abcf19 100644 --- a/common/src/test/java/org/keycloak/common/ProfileTest.java +++ b/common/src/test/java/org/keycloak/common/ProfileTest.java @@ -1,17 +1,5 @@ package org.keycloak.common; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; -import org.keycloak.common.profile.CommaSeparatedListProfileConfigResolver; -import org.keycloak.common.profile.ProfileException; -import org.keycloak.common.profile.PropertiesProfileConfigResolver; - import java.security.Provider; import java.security.Security; import java.util.AbstractMap; @@ -23,6 +11,19 @@ import java.util.Map; import java.util.Properties; import java.util.Set; +import org.keycloak.common.profile.CommaSeparatedListProfileConfigResolver; +import org.keycloak.common.profile.ProfileException; +import org.keycloak.common.profile.PropertiesProfileConfigResolver; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.After; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; + import static org.junit.Assert.assertThrows; public class ProfileTest { diff --git a/common/src/test/java/org/keycloak/common/crypto/CryptoIntegrationTest.java b/common/src/test/java/org/keycloak/common/crypto/CryptoIntegrationTest.java index 170ae1ce329..dbb608637bd 100644 --- a/common/src/test/java/org/keycloak/common/crypto/CryptoIntegrationTest.java +++ b/common/src/test/java/org/keycloak/common/crypto/CryptoIntegrationTest.java @@ -1,11 +1,11 @@ package org.keycloak.common.crypto; -import static org.junit.Assert.assertNull; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import static org.junit.Assert.assertNull; + public class CryptoIntegrationTest { private static CryptoProvider originalProvider; diff --git a/common/src/test/java/org/keycloak/common/enums/SslRequiredTest.java b/common/src/test/java/org/keycloak/common/enums/SslRequiredTest.java index 346a4eaade5..16ffa239327 100644 --- a/common/src/test/java/org/keycloak/common/enums/SslRequiredTest.java +++ b/common/src/test/java/org/keycloak/common/enums/SslRequiredTest.java @@ -1,12 +1,12 @@ package org.keycloak.common.enums; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class SslRequiredTest { @Test diff --git a/common/src/test/java/org/keycloak/common/util/Base64DecodeTest.java b/common/src/test/java/org/keycloak/common/util/Base64DecodeTest.java index 6c32f896bd4..506646e0f7d 100644 --- a/common/src/test/java/org/keycloak/common/util/Base64DecodeTest.java +++ b/common/src/test/java/org/keycloak/common/util/Base64DecodeTest.java @@ -1,10 +1,10 @@ package org.keycloak.common.util; +import java.io.IOException; + import org.hamcrest.MatcherAssert; import org.junit.Test; -import java.io.IOException; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; diff --git a/common/src/test/java/org/keycloak/common/util/CollectionUtilTest.java b/common/src/test/java/org/keycloak/common/util/CollectionUtilTest.java index 95b91edc1b7..542b18458fd 100644 --- a/common/src/test/java/org/keycloak/common/util/CollectionUtilTest.java +++ b/common/src/test/java/org/keycloak/common/util/CollectionUtilTest.java @@ -1,14 +1,14 @@ package org.keycloak.common.util; -import org.junit.Assert; -import org.junit.Test; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; +import org.junit.Assert; +import org.junit.Test; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/common/src/test/java/org/keycloak/common/util/KeyUtilsTest.java b/common/src/test/java/org/keycloak/common/util/KeyUtilsTest.java index a1a40808350..a967fbd1214 100644 --- a/common/src/test/java/org/keycloak/common/util/KeyUtilsTest.java +++ b/common/src/test/java/org/keycloak/common/util/KeyUtilsTest.java @@ -1,10 +1,10 @@ package org.keycloak.common.util; -import org.junit.Test; - +import java.util.concurrent.ThreadLocalRandom; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import java.util.concurrent.ThreadLocalRandom; + +import org.junit.Test; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/common/src/test/java/org/keycloak/common/util/KeycloakUriBuilderTest.java b/common/src/test/java/org/keycloak/common/util/KeycloakUriBuilderTest.java index e902fa7df78..6a47690ee4c 100644 --- a/common/src/test/java/org/keycloak/common/util/KeycloakUriBuilderTest.java +++ b/common/src/test/java/org/keycloak/common/util/KeycloakUriBuilderTest.java @@ -19,6 +19,7 @@ package org.keycloak.common.util; import java.util.Collections; + import org.junit.Assert; import org.junit.Test; diff --git a/common/src/test/java/org/keycloak/common/util/KeystoreUtilTest.java b/common/src/test/java/org/keycloak/common/util/KeystoreUtilTest.java index 2a35fd5e3d5..3f7892b4f02 100644 --- a/common/src/test/java/org/keycloak/common/util/KeystoreUtilTest.java +++ b/common/src/test/java/org/keycloak/common/util/KeystoreUtilTest.java @@ -1,10 +1,10 @@ package org.keycloak.common.util; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import org.junit.Test; - public class KeystoreUtilTest { @Test diff --git a/common/src/test/java/org/keycloak/common/util/MultivaluedHashMapTest.java b/common/src/test/java/org/keycloak/common/util/MultivaluedHashMapTest.java index 99dc3fcd671..5e267f56a89 100644 --- a/common/src/test/java/org/keycloak/common/util/MultivaluedHashMapTest.java +++ b/common/src/test/java/org/keycloak/common/util/MultivaluedHashMapTest.java @@ -17,6 +17,7 @@ package org.keycloak.common.util; import java.util.Arrays; + import org.junit.Test; import static org.junit.Assert.assertFalse; diff --git a/common/src/test/java/org/keycloak/common/util/PathMatcherTest.java b/common/src/test/java/org/keycloak/common/util/PathMatcherTest.java index 985faf948ce..2a6cccc98b5 100644 --- a/common/src/test/java/org/keycloak/common/util/PathMatcherTest.java +++ b/common/src/test/java/org/keycloak/common/util/PathMatcherTest.java @@ -1,10 +1,10 @@ package org.keycloak.common.util; +import java.util.Collection; + import org.junit.Assert; import org.junit.Test; -import java.util.Collection; - public class PathMatcherTest { @Test diff --git a/common/src/test/java/org/keycloak/common/util/StringPropertyReplacerTest.java b/common/src/test/java/org/keycloak/common/util/StringPropertyReplacerTest.java index 3ccd6572ddf..5f9139e2dfe 100644 --- a/common/src/test/java/org/keycloak/common/util/StringPropertyReplacerTest.java +++ b/common/src/test/java/org/keycloak/common/util/StringPropertyReplacerTest.java @@ -19,7 +19,6 @@ package org.keycloak.common.util; import java.security.NoSuchAlgorithmException; - import java.util.Map; import org.junit.Assert; diff --git a/common/src/test/java/org/keycloak/common/util/StringSerializationTest.java b/common/src/test/java/org/keycloak/common/util/StringSerializationTest.java index 1d3e2b23d3b..03f9749c871 100644 --- a/common/src/test/java/org/keycloak/common/util/StringSerializationTest.java +++ b/common/src/test/java/org/keycloak/common/util/StringSerializationTest.java @@ -16,12 +16,15 @@ */ package org.keycloak.common.util; -import org.keycloak.common.util.StringSerialization.Deserializer; import java.net.URI; + +import org.keycloak.common.util.StringSerialization.Deserializer; + import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; /** * diff --git a/core/src/main/java/org/keycloak/AbstractOAuthClient.java b/core/src/main/java/org/keycloak/AbstractOAuthClient.java index ced1f3552c2..c3ab804cb77 100644 --- a/core/src/main/java/org/keycloak/AbstractOAuthClient.java +++ b/core/src/main/java/org/keycloak/AbstractOAuthClient.java @@ -17,13 +17,13 @@ package org.keycloak; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; + import org.keycloak.common.enums.RelativeUrlsUsed; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.common.util.SecretGenerator; -import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/core/src/main/java/org/keycloak/AuthorizationContext.java b/core/src/main/java/org/keycloak/AuthorizationContext.java index 566be8e9cdf..d4835dab679 100644 --- a/core/src/main/java/org/keycloak/AuthorizationContext.java +++ b/core/src/main/java/org/keycloak/AuthorizationContext.java @@ -17,15 +17,15 @@ */ package org.keycloak; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import org.keycloak.representations.AccessToken; import org.keycloak.representations.AccessToken.Authorization; import org.keycloak.representations.adapters.config.PolicyEnforcerConfig.PathConfig; import org.keycloak.representations.idm.authorization.Permission; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - /** * @author Pedro Igor */ diff --git a/core/src/main/java/org/keycloak/KeyPairVerifier.java b/core/src/main/java/org/keycloak/KeyPairVerifier.java index a224aa19762..8b6818a4241 100644 --- a/core/src/main/java/org/keycloak/KeyPairVerifier.java +++ b/core/src/main/java/org/keycloak/KeyPairVerifier.java @@ -17,15 +17,15 @@ package org.keycloak; +import java.security.PrivateKey; +import java.security.PublicKey; + import org.keycloak.common.VerificationException; import org.keycloak.common.util.PemUtils; import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.crypto.RSAProvider; -import java.security.PrivateKey; -import java.security.PublicKey; - /** * @author Stian Thorgersen */ diff --git a/core/src/main/java/org/keycloak/KeycloakPrincipal.java b/core/src/main/java/org/keycloak/KeycloakPrincipal.java index beb7448599c..61c94a9b944 100755 --- a/core/src/main/java/org/keycloak/KeycloakPrincipal.java +++ b/core/src/main/java/org/keycloak/KeycloakPrincipal.java @@ -17,13 +17,13 @@ package org.keycloak; -import org.keycloak.common.util.DelegatingSerializationFilter; - import java.io.IOException; import java.io.ObjectInputStream; import java.io.Serializable; import java.security.Principal; +import org.keycloak.common.util.DelegatingSerializationFilter; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/core/src/main/java/org/keycloak/KeycloakSecurityContext.java b/core/src/main/java/org/keycloak/KeycloakSecurityContext.java index 450e1de85a6..b10e10237d5 100755 --- a/core/src/main/java/org/keycloak/KeycloakSecurityContext.java +++ b/core/src/main/java/org/keycloak/KeycloakSecurityContext.java @@ -17,17 +17,17 @@ package org.keycloak; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.DelegatingSerializationFilter; import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; - /** * Available in secured requests under HttpServletRequest.getAttribute() * Also available in HttpSession.getAttribute under the classname of this class diff --git a/core/src/main/java/org/keycloak/OAuth2Constants.java b/core/src/main/java/org/keycloak/OAuth2Constants.java index 665823d2030..a029bd8c50b 100755 --- a/core/src/main/java/org/keycloak/OAuth2Constants.java +++ b/core/src/main/java/org/keycloak/OAuth2Constants.java @@ -174,5 +174,3 @@ public interface OAuth2Constants { String ALGS_ATTRIBUTE = "algs"; } - - diff --git a/core/src/main/java/org/keycloak/RSATokenVerifier.java b/core/src/main/java/org/keycloak/RSATokenVerifier.java index 226ea775e7e..036c9d37b21 100755 --- a/core/src/main/java/org/keycloak/RSATokenVerifier.java +++ b/core/src/main/java/org/keycloak/RSATokenVerifier.java @@ -17,12 +17,12 @@ package org.keycloak; +import java.security.PublicKey; + import org.keycloak.common.VerificationException; import org.keycloak.jose.jws.JWSHeader; import org.keycloak.representations.AccessToken; -import java.security.PublicKey; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/core/src/main/java/org/keycloak/TokenIdGenerator.java b/core/src/main/java/org/keycloak/TokenIdGenerator.java index 4320a7f6975..73f50219eb4 100755 --- a/core/src/main/java/org/keycloak/TokenIdGenerator.java +++ b/core/src/main/java/org/keycloak/TokenIdGenerator.java @@ -17,10 +17,10 @@ package org.keycloak; -import org.keycloak.common.util.SecretGenerator; - import java.util.concurrent.atomic.AtomicLong; +import org.keycloak.common.util.SecretGenerator; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/core/src/main/java/org/keycloak/TokenVerifier.java b/core/src/main/java/org/keycloak/TokenVerifier.java index ac402d19ee0..dbda9c947eb 100755 --- a/core/src/main/java/org/keycloak/TokenVerifier.java +++ b/core/src/main/java/org/keycloak/TokenVerifier.java @@ -17,21 +17,6 @@ package org.keycloak; -import org.keycloak.common.VerificationException; -import org.keycloak.exceptions.TokenNotActiveException; -import org.keycloak.exceptions.TokenSignatureInvalidException; -import org.keycloak.jose.jws.AlgorithmType; -import org.keycloak.jose.jws.JWSHeader; -import org.keycloak.jose.jws.JWSInput; -import org.keycloak.jose.jws.JWSInputException; -import org.keycloak.crypto.SignatureVerifierContext; -import org.keycloak.jose.jws.crypto.HMACProvider; -import org.keycloak.jose.jws.crypto.RSAProvider; -import org.keycloak.representations.JsonWebToken; -import org.keycloak.util.TokenUtil; - -import javax.crypto.SecretKey; - import java.nio.charset.StandardCharsets; import java.security.PublicKey; import java.util.Arrays; @@ -40,6 +25,20 @@ import java.util.LinkedList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import javax.crypto.SecretKey; + +import org.keycloak.common.VerificationException; +import org.keycloak.crypto.SignatureVerifierContext; +import org.keycloak.exceptions.TokenNotActiveException; +import org.keycloak.exceptions.TokenSignatureInvalidException; +import org.keycloak.jose.jws.AlgorithmType; +import org.keycloak.jose.jws.JWSHeader; +import org.keycloak.jose.jws.JWSInput; +import org.keycloak.jose.jws.JWSInputException; +import org.keycloak.jose.jws.crypto.HMACProvider; +import org.keycloak.jose.jws.crypto.RSAProvider; +import org.keycloak.representations.JsonWebToken; +import org.keycloak.util.TokenUtil; /** * @author Bill Burke diff --git a/core/src/main/java/org/keycloak/crypto/AsymmetricSignatureVerifierContext.java b/core/src/main/java/org/keycloak/crypto/AsymmetricSignatureVerifierContext.java index 202d19d9914..9221f98b316 100644 --- a/core/src/main/java/org/keycloak/crypto/AsymmetricSignatureVerifierContext.java +++ b/core/src/main/java/org/keycloak/crypto/AsymmetricSignatureVerifierContext.java @@ -16,14 +16,14 @@ */ package org.keycloak.crypto; -import org.keycloak.common.VerificationException; -import org.keycloak.common.crypto.CryptoIntegration; - import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; import java.security.PublicKey; import java.security.Signature; +import org.keycloak.common.VerificationException; +import org.keycloak.common.crypto.CryptoIntegration; + public class AsymmetricSignatureVerifierContext implements SignatureVerifierContext { private final KeyWrapper key; diff --git a/core/src/main/java/org/keycloak/crypto/ECDSAAlgorithm.java b/core/src/main/java/org/keycloak/crypto/ECDSAAlgorithm.java index 8bdc7efd1ae..8596d4a36fa 100644 --- a/core/src/main/java/org/keycloak/crypto/ECDSAAlgorithm.java +++ b/core/src/main/java/org/keycloak/crypto/ECDSAAlgorithm.java @@ -17,6 +17,7 @@ package org.keycloak.crypto; import java.io.IOException; + import org.keycloak.common.crypto.CryptoIntegration; /** diff --git a/core/src/main/java/org/keycloak/crypto/KeyWrapper.java b/core/src/main/java/org/keycloak/crypto/KeyWrapper.java index 3be4265305f..7e7de05cd68 100644 --- a/core/src/main/java/org/keycloak/crypto/KeyWrapper.java +++ b/core/src/main/java/org/keycloak/crypto/KeyWrapper.java @@ -16,11 +16,11 @@ */ package org.keycloak.crypto; -import javax.crypto.SecretKey; import java.security.Key; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.List; +import javax.crypto.SecretKey; public class KeyWrapper { diff --git a/core/src/main/java/org/keycloak/crypto/MacSignatureVerifierContext.java b/core/src/main/java/org/keycloak/crypto/MacSignatureVerifierContext.java index 049c9b1a709..cd576d957a3 100644 --- a/core/src/main/java/org/keycloak/crypto/MacSignatureVerifierContext.java +++ b/core/src/main/java/org/keycloak/crypto/MacSignatureVerifierContext.java @@ -16,10 +16,10 @@ */ package org.keycloak.crypto; -import org.keycloak.common.VerificationException; - -import javax.crypto.Mac; import java.security.MessageDigest; +import javax.crypto.Mac; + +import org.keycloak.common.VerificationException; public class MacSignatureVerifierContext implements SignatureVerifierContext { diff --git a/core/src/main/java/org/keycloak/jose/JOSEParser.java b/core/src/main/java/org/keycloak/jose/JOSEParser.java index c377a130aa3..e883bad12ff 100644 --- a/core/src/main/java/org/keycloak/jose/JOSEParser.java +++ b/core/src/main/java/org/keycloak/jose/JOSEParser.java @@ -2,13 +2,14 @@ package org.keycloak.jose; import java.io.IOException; -import com.fasterxml.jackson.databind.JsonNode; import org.keycloak.common.util.Base64Url; import org.keycloak.jose.jwe.JWE; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.databind.JsonNode; + /** * @author Pedro Igor */ diff --git a/core/src/main/java/org/keycloak/jose/jwe/JWE.java b/core/src/main/java/org/keycloak/jose/jwe/JWE.java index 99d3d109fe3..3a8461bb312 100644 --- a/core/src/main/java/org/keycloak/jose/jwe/JWE.java +++ b/core/src/main/java/org/keycloak/jose/jwe/JWE.java @@ -17,6 +17,8 @@ package org.keycloak.jose.jwe; +import java.io.IOException; + import org.keycloak.common.util.Base64Url; import org.keycloak.jose.JOSE; import org.keycloak.jose.JOSEHeader; @@ -25,8 +27,6 @@ import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; import org.keycloak.util.JsonSerialization; -import java.io.IOException; - /** * @author Marek Posolda */ diff --git a/core/src/main/java/org/keycloak/jose/jwe/JWEHeader.java b/core/src/main/java/org/keycloak/jose/jwe/JWEHeader.java index c3b84011b86..6cd5966247e 100644 --- a/core/src/main/java/org/keycloak/jose/jwe/JWEHeader.java +++ b/core/src/main/java/org/keycloak/jose/jwe/JWEHeader.java @@ -20,13 +20,14 @@ package org.keycloak.jose.jwe; import java.io.IOException; import java.io.UncheckedIOException; +import org.keycloak.jose.JOSEHeader; +import org.keycloak.jose.jwk.ECPublicJWK; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; -import org.keycloak.jose.JOSEHeader; -import org.keycloak.jose.jwk.ECPublicJWK; /** * @author Marek Posolda diff --git a/core/src/main/java/org/keycloak/jose/jwe/alg/JWEAlgorithmProvider.java b/core/src/main/java/org/keycloak/jose/jwe/alg/JWEAlgorithmProvider.java index 4ad5653764b..3b691ea912d 100644 --- a/core/src/main/java/org/keycloak/jose/jwe/alg/JWEAlgorithmProvider.java +++ b/core/src/main/java/org/keycloak/jose/jwe/alg/JWEAlgorithmProvider.java @@ -20,8 +20,8 @@ package org.keycloak.jose.jwe.alg; import java.security.Key; import org.keycloak.jose.jwe.JWEHeader; -import org.keycloak.jose.jwe.JWEKeyStorage; import org.keycloak.jose.jwe.JWEHeader.JWEHeaderBuilder; +import org.keycloak.jose.jwe.JWEKeyStorage; import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; /** diff --git a/core/src/main/java/org/keycloak/jose/jwe/enc/AesCbcHmacShaEncryptionProvider.java b/core/src/main/java/org/keycloak/jose/jwe/enc/AesCbcHmacShaEncryptionProvider.java index 3e17a09f807..a62f51fbd2e 100644 --- a/core/src/main/java/org/keycloak/jose/jwe/enc/AesCbcHmacShaEncryptionProvider.java +++ b/core/src/main/java/org/keycloak/jose/jwe/enc/AesCbcHmacShaEncryptionProvider.java @@ -28,7 +28,6 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.spec.AlgorithmParameterSpec; import java.util.Arrays; - import javax.crypto.Cipher; import javax.crypto.Mac; import javax.crypto.spec.IvParameterSpec; diff --git a/core/src/main/java/org/keycloak/jose/jwe/enc/AesGcmEncryptionProvider.java b/core/src/main/java/org/keycloak/jose/jwe/enc/AesGcmEncryptionProvider.java index fe3befc691c..1b4dbdc54a6 100644 --- a/core/src/main/java/org/keycloak/jose/jwe/enc/AesGcmEncryptionProvider.java +++ b/core/src/main/java/org/keycloak/jose/jwe/enc/AesGcmEncryptionProvider.java @@ -22,7 +22,6 @@ import java.security.GeneralSecurityException; import java.security.InvalidKeyException; import java.security.Key; import java.security.NoSuchAlgorithmException; - import javax.crypto.Cipher; import javax.crypto.spec.GCMParameterSpec; import javax.crypto.spec.SecretKeySpec; diff --git a/core/src/main/java/org/keycloak/jose/jwk/EdECUtils.java b/core/src/main/java/org/keycloak/jose/jwk/EdECUtils.java index 52cdc720982..49bc2f8b963 100644 --- a/core/src/main/java/org/keycloak/jose/jwk/EdECUtils.java +++ b/core/src/main/java/org/keycloak/jose/jwk/EdECUtils.java @@ -18,6 +18,7 @@ package org.keycloak.jose.jwk; import java.security.Key; import java.security.PublicKey; + import org.keycloak.crypto.KeyUse; /** diff --git a/core/src/main/java/org/keycloak/jose/jwk/EdECUtilsImpl.java b/core/src/main/java/org/keycloak/jose/jwk/EdECUtilsImpl.java index 1bdb5a364fe..97ab47948d5 100644 --- a/core/src/main/java/org/keycloak/jose/jwk/EdECUtilsImpl.java +++ b/core/src/main/java/org/keycloak/jose/jwk/EdECUtilsImpl.java @@ -27,6 +27,7 @@ import java.security.spec.EdECPublicKeySpec; import java.security.spec.InvalidKeySpecException; import java.security.spec.NamedParameterSpec; import java.util.Optional; + import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.KeyUtils; import org.keycloak.crypto.Algorithm; diff --git a/core/src/main/java/org/keycloak/jose/jwk/EdECUtilsUnsupportedImpl.java b/core/src/main/java/org/keycloak/jose/jwk/EdECUtilsUnsupportedImpl.java index 35121e4f800..a16aa0a5ce4 100644 --- a/core/src/main/java/org/keycloak/jose/jwk/EdECUtilsUnsupportedImpl.java +++ b/core/src/main/java/org/keycloak/jose/jwk/EdECUtilsUnsupportedImpl.java @@ -18,6 +18,7 @@ package org.keycloak.jose.jwk; import java.security.Key; import java.security.PublicKey; + import org.keycloak.crypto.KeyUse; /** diff --git a/core/src/main/java/org/keycloak/jose/jwk/JWK.java b/core/src/main/java/org/keycloak/jose/jwk/JWK.java index 39fbf64e340..a52cb17ae17 100755 --- a/core/src/main/java/org/keycloak/jose/jwk/JWK.java +++ b/core/src/main/java/org/keycloak/jose/jwk/JWK.java @@ -17,15 +17,16 @@ package org.keycloak.jose.jwk; +import java.security.NoSuchAlgorithmException; +import java.util.HashMap; +import java.util.Map; + +import org.keycloak.common.util.PemUtils; + import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.common.util.PemUtils; - -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.Map; /** * @author Stian Thorgersen 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 daeca3df087..74110b6ae81 100644 --- a/core/src/main/java/org/keycloak/jose/jwk/JWKBuilder.java +++ b/core/src/main/java/org/keycloak/jose/jwk/JWKBuilder.java @@ -17,8 +17,6 @@ package org.keycloak.jose.jwk; -import static org.keycloak.jose.jwk.JWKUtil.toIntegerBytes; - import java.security.Key; import java.security.PublicKey; import java.security.cert.X509Certificate; @@ -34,6 +32,8 @@ import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyType; import org.keycloak.crypto.KeyUse; +import static org.keycloak.jose.jwk.JWKUtil.toIntegerBytes; + /** * @author Stian Thorgersen */ 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 e1c9bd65127..eb6082b29f5 100644 --- a/core/src/main/java/org/keycloak/jose/jwk/JWKParser.java +++ b/core/src/main/java/org/keycloak/jose/jwk/JWKParser.java @@ -25,12 +25,13 @@ import java.security.spec.ECPoint; import java.security.spec.ECPublicKeySpec; import java.security.spec.RSAPublicKeySpec; -import com.fasterxml.jackson.databind.JsonNode; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.util.Base64Url; import org.keycloak.crypto.KeyType; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.databind.JsonNode; + /** * @author Stian Thorgersen */ diff --git a/core/src/main/java/org/keycloak/jose/jwk/OKPPublicJWK.java b/core/src/main/java/org/keycloak/jose/jwk/OKPPublicJWK.java index fbd40cee5a9..71be139e177 100644 --- a/core/src/main/java/org/keycloak/jose/jwk/OKPPublicJWK.java +++ b/core/src/main/java/org/keycloak/jose/jwk/OKPPublicJWK.java @@ -17,9 +17,9 @@ package org.keycloak.jose.jwk; -import com.fasterxml.jackson.annotation.JsonIgnore; import org.keycloak.crypto.KeyType; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/core/src/main/java/org/keycloak/jose/jwk/RSAPublicJWK.java b/core/src/main/java/org/keycloak/jose/jwk/RSAPublicJWK.java index ac6090195ab..280746a5642 100644 --- a/core/src/main/java/org/keycloak/jose/jwk/RSAPublicJWK.java +++ b/core/src/main/java/org/keycloak/jose/jwk/RSAPublicJWK.java @@ -17,11 +17,12 @@ package org.keycloak.jose.jwk; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.security.NoSuchAlgorithmException; + import org.keycloak.common.util.PemUtils; -import java.security.NoSuchAlgorithmException; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; /** * @author Stian Thorgersen 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 ef6efb3c0da..cef5914e6a4 100755 --- a/core/src/main/java/org/keycloak/jose/jws/JWSBuilder.java +++ b/core/src/main/java/org/keycloak/jose/jws/JWSBuilder.java @@ -17,15 +17,6 @@ package org.keycloak.jose.jws; -import com.fasterxml.jackson.core.JsonProcessingException; -import org.keycloak.common.util.Base64Url; -import org.keycloak.crypto.SignatureSignerContext; -import org.keycloak.jose.jwk.JWK; -import org.keycloak.jose.jws.crypto.HMACProvider; -import org.keycloak.jose.jws.crypto.RSAProvider; -import org.keycloak.util.JsonSerialization; - -import javax.crypto.SecretKey; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.security.PrivateKey; @@ -34,6 +25,16 @@ import java.security.cert.X509Certificate; import java.util.Base64; import java.util.List; import java.util.stream.Collectors; +import javax.crypto.SecretKey; + +import org.keycloak.common.util.Base64Url; +import org.keycloak.crypto.SignatureSignerContext; +import org.keycloak.jose.jwk.JWK; +import org.keycloak.jose.jws.crypto.HMACProvider; +import org.keycloak.jose.jws.crypto.RSAProvider; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.JsonProcessingException; /** * @author Bill Burke diff --git a/core/src/main/java/org/keycloak/jose/jws/JWSHeader.java b/core/src/main/java/org/keycloak/jose/jws/JWSHeader.java index 16a1aa2e634..f3327964b4e 100755 --- a/core/src/main/java/org/keycloak/jose/jws/JWSHeader.java +++ b/core/src/main/java/org/keycloak/jose/jws/JWSHeader.java @@ -17,18 +17,18 @@ package org.keycloak.jose.jws; +import java.io.IOException; +import java.util.List; + +import org.keycloak.jose.JOSEHeader; +import org.keycloak.jose.jwk.JWK; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.ObjectMapper; -import org.keycloak.jose.JOSEHeader; -import org.keycloak.jose.jwk.JWK; - -import java.io.IOException; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ 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 a8c735a8ab0..ab806b685d8 100755 --- a/core/src/main/java/org/keycloak/jose/jws/JWSInput.java +++ b/core/src/main/java/org/keycloak/jose/jws/JWSInput.java @@ -17,13 +17,13 @@ package org.keycloak.jose.jws; +import java.io.IOException; +import java.nio.charset.StandardCharsets; + import org.keycloak.common.util.Base64Url; import org.keycloak.jose.JOSE; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.nio.charset.StandardCharsets; - /** * @author Bill Burke * @version $Revision: 1 $ 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 bfc19acbd93..11864c60eb9 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 @@ -18,17 +18,16 @@ package org.keycloak.jose.jws.crypto; -import org.keycloak.common.util.Base64Url; -import org.keycloak.jose.jws.Algorithm; -import org.keycloak.jose.jws.JWSInput; - +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import javax.crypto.Mac; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; +import org.keycloak.common.util.Base64Url; +import org.keycloak.jose.jws.Algorithm; +import org.keycloak.jose.jws.JWSInput; /** * @author Bill Burke diff --git a/core/src/main/java/org/keycloak/jose/jws/crypto/HashUtils.java b/core/src/main/java/org/keycloak/jose/jws/crypto/HashUtils.java index 55f2c1aeee0..b84f6278fe7 100644 --- a/core/src/main/java/org/keycloak/jose/jws/crypto/HashUtils.java +++ b/core/src/main/java/org/keycloak/jose/jws/crypto/HashUtils.java @@ -17,15 +17,15 @@ package org.keycloak.jose.jws.crypto; -import org.keycloak.common.util.Base64Url; -import org.keycloak.crypto.HashException; -import org.keycloak.crypto.JavaAlgorithm; - import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.util.Arrays; +import org.keycloak.common.util.Base64Url; +import org.keycloak.crypto.HashException; +import org.keycloak.crypto.JavaAlgorithm; + /** * @author Marek Posolda */ 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 35243d12608..a31eeb7ef33 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 @@ -18,16 +18,16 @@ package org.keycloak.jose.jws.crypto; -import org.keycloak.common.util.PemUtils; -import org.keycloak.jose.jws.Algorithm; -import org.keycloak.jose.jws.JWSInput; - import java.nio.charset.StandardCharsets; import java.security.PrivateKey; import java.security.PublicKey; import java.security.Signature; import java.security.cert.X509Certificate; +import org.keycloak.common.util.PemUtils; +import org.keycloak.jose.jws.Algorithm; +import org.keycloak.jose.jws.JWSInput; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/core/src/main/java/org/keycloak/json/StringListMapDeserializer.java b/core/src/main/java/org/keycloak/json/StringListMapDeserializer.java index 1241fd0ae6d..ef981447a79 100644 --- a/core/src/main/java/org/keycloak/json/StringListMapDeserializer.java +++ b/core/src/main/java/org/keycloak/json/StringListMapDeserializer.java @@ -17,12 +17,6 @@ package org.keycloak.json; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; - import java.io.IOException; import java.util.HashMap; import java.util.Iterator; @@ -30,6 +24,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; + public class StringListMapDeserializer extends JsonDeserializer { @Override diff --git a/core/src/main/java/org/keycloak/json/StringOrArrayDeserializer.java b/core/src/main/java/org/keycloak/json/StringOrArrayDeserializer.java index 42ce211d4ef..850a42bf11b 100644 --- a/core/src/main/java/org/keycloak/json/StringOrArrayDeserializer.java +++ b/core/src/main/java/org/keycloak/json/StringOrArrayDeserializer.java @@ -17,15 +17,15 @@ package org.keycloak.json; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Iterator; - public class StringOrArrayDeserializer extends JsonDeserializer { @Override diff --git a/core/src/main/java/org/keycloak/json/StringOrArraySerializer.java b/core/src/main/java/org/keycloak/json/StringOrArraySerializer.java index 1e9ce1eb87c..8b258cc4fb0 100644 --- a/core/src/main/java/org/keycloak/json/StringOrArraySerializer.java +++ b/core/src/main/java/org/keycloak/json/StringOrArraySerializer.java @@ -17,12 +17,12 @@ package org.keycloak.json; +import java.io.IOException; + import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import java.io.IOException; - public class StringOrArraySerializer extends JsonSerializer { @Override public void serialize(Object o, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { diff --git a/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/ClientCredentialsProviderUtils.java b/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/ClientCredentialsProviderUtils.java index dacd9aa40ff..7b68dbf384a 100644 --- a/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/ClientCredentialsProviderUtils.java +++ b/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/ClientCredentialsProviderUtils.java @@ -23,9 +23,10 @@ import java.util.Map; import java.util.ServiceConfigurationError; import java.util.ServiceLoader; -import org.jboss.logging.Logger; import org.keycloak.representations.adapters.config.AdapterConfig; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/ClientIdAndSecretCredentialsProvider.java b/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/ClientIdAndSecretCredentialsProvider.java index b90233463d1..2a5530dbbf9 100644 --- a/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/ClientIdAndSecretCredentialsProvider.java +++ b/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/ClientIdAndSecretCredentialsProvider.java @@ -19,12 +19,13 @@ package org.keycloak.protocol.oidc.client.authentication; import java.util.Map; -import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.representations.adapters.config.AdapterConfig; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.util.BasicAuthHelper; +import org.jboss.logging.Logger; + /** * Traditional OAuth2 authentication of clients based on client_id and client_secret * diff --git a/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/JWTClientSecretCredentialsProvider.java b/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/JWTClientSecretCredentialsProvider.java index 210cb4be5ae..631c9ef9aa1 100644 --- a/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/JWTClientSecretCredentialsProvider.java +++ b/core/src/main/java/org/keycloak/protocol/oidc/client/authentication/JWTClientSecretCredentialsProvider.java @@ -18,11 +18,9 @@ package org.keycloak.protocol.oidc.client.authentication; import java.nio.charset.StandardCharsets; import java.util.Map; - import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.common.util.SecretGenerator; import org.keycloak.common.util.Time; @@ -32,6 +30,8 @@ import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.representations.JsonWebToken; import org.keycloak.representations.adapters.config.AdapterConfig; +import org.jboss.logging.Logger; + /** * Client authentication based on JWT signed by client secret instead of private key . * See specs for more details. diff --git a/core/src/main/java/org/keycloak/protocol/oidc/representations/OIDCConfigurationRepresentation.java b/core/src/main/java/org/keycloak/protocol/oidc/representations/OIDCConfigurationRepresentation.java index b3c5c67eb20..1f2b4dc4db1 100755 --- a/core/src/main/java/org/keycloak/protocol/oidc/representations/OIDCConfigurationRepresentation.java +++ b/core/src/main/java/org/keycloak/protocol/oidc/representations/OIDCConfigurationRepresentation.java @@ -17,14 +17,14 @@ package org.keycloak.protocol.oidc.representations; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.HashMap; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Stian Thorgersen */ diff --git a/core/src/main/java/org/keycloak/representations/AccessToken.java b/core/src/main/java/org/keycloak/representations/AccessToken.java index d16b72443ed..6abe58c9245 100755 --- a/core/src/main/java/org/keycloak/representations/AccessToken.java +++ b/core/src/main/java/org/keycloak/representations/AccessToken.java @@ -17,11 +17,6 @@ package org.keycloak.representations; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.TokenCategory; -import org.keycloak.representations.idm.authorization.Permission; - import java.io.Serializable; import java.util.Collection; import java.util.Collections; @@ -30,6 +25,12 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.keycloak.TokenCategory; +import org.keycloak.representations.idm.authorization.Permission; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/core/src/main/java/org/keycloak/representations/AccessTokenResponse.java b/core/src/main/java/org/keycloak/representations/AccessTokenResponse.java index b3e7020d283..49fac581fe2 100755 --- a/core/src/main/java/org/keycloak/representations/AccessTokenResponse.java +++ b/core/src/main/java/org/keycloak/representations/AccessTokenResponse.java @@ -17,13 +17,13 @@ package org.keycloak.representations; +import java.util.HashMap; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.HashMap; -import java.util.Map; - /** * OAuth 2.0 Access Token Response json * diff --git a/core/src/main/java/org/keycloak/representations/AuthorizationDetailsJSONRepresentation.java b/core/src/main/java/org/keycloak/representations/AuthorizationDetailsJSONRepresentation.java index 4c4a3ad8736..1b69fdc5883 100644 --- a/core/src/main/java/org/keycloak/representations/AuthorizationDetailsJSONRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/AuthorizationDetailsJSONRepresentation.java @@ -16,16 +16,16 @@ */ package org.keycloak.representations; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * The JSON representation of a Rich Authorization Request's "authorization_details" object. * diff --git a/core/src/main/java/org/keycloak/representations/IDToken.java b/core/src/main/java/org/keycloak/representations/IDToken.java index 8f7f25958fb..15e4f8c63e3 100755 --- a/core/src/main/java/org/keycloak/representations/IDToken.java +++ b/core/src/main/java/org/keycloak/representations/IDToken.java @@ -17,9 +17,10 @@ package org.keycloak.representations; +import org.keycloak.TokenCategory; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.TokenCategory; /** * @author Bill Burke diff --git a/core/src/main/java/org/keycloak/representations/JsonWebToken.java b/core/src/main/java/org/keycloak/representations/JsonWebToken.java index ce1a98fb1e7..e5bf33de9d4 100755 --- a/core/src/main/java/org/keycloak/representations/JsonWebToken.java +++ b/core/src/main/java/org/keycloak/representations/JsonWebToken.java @@ -17,23 +17,24 @@ package org.keycloak.representations; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.io.Serializable; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.Token; import org.keycloak.TokenCategory; import org.keycloak.common.util.Time; import org.keycloak.json.StringOrArrayDeserializer; import org.keycloak.json.StringOrArraySerializer; -import java.io.Serializable; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * @author Bill Burke diff --git a/core/src/main/java/org/keycloak/representations/LogoutToken.java b/core/src/main/java/org/keycloak/representations/LogoutToken.java index cc665d43f82..3bbdec0732d 100644 --- a/core/src/main/java/org/keycloak/representations/LogoutToken.java +++ b/core/src/main/java/org/keycloak/representations/LogoutToken.java @@ -1,13 +1,13 @@ package org.keycloak.representations; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.TokenCategory; import org.keycloak.util.TokenUtil; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.HashMap; -import java.util.Map; - public class LogoutToken extends JsonWebToken { @JsonProperty("sid") diff --git a/core/src/main/java/org/keycloak/representations/OAuth2DeviceAuthorizationResponse.java b/core/src/main/java/org/keycloak/representations/OAuth2DeviceAuthorizationResponse.java index b0e637040d7..7eafb495fe2 100755 --- a/core/src/main/java/org/keycloak/representations/OAuth2DeviceAuthorizationResponse.java +++ b/core/src/main/java/org/keycloak/representations/OAuth2DeviceAuthorizationResponse.java @@ -17,11 +17,12 @@ package org.keycloak.representations; -import static org.keycloak.OAuth2Constants.EXPIRES_IN; -import static org.keycloak.OAuth2Constants.INTERVAL; +import org.keycloak.OAuth2Constants; import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.OAuth2Constants; + +import static org.keycloak.OAuth2Constants.EXPIRES_IN; +import static org.keycloak.OAuth2Constants.INTERVAL; /** * Representation for Device Authorization Response. diff --git a/core/src/main/java/org/keycloak/representations/UserInfo.java b/core/src/main/java/org/keycloak/representations/UserInfo.java index 267696e3f92..e6989f56dba 100755 --- a/core/src/main/java/org/keycloak/representations/UserInfo.java +++ b/core/src/main/java/org/keycloak/representations/UserInfo.java @@ -16,17 +16,18 @@ */ package org.keycloak.representations; +import java.util.HashMap; +import java.util.Map; + +import org.keycloak.json.StringOrArrayDeserializer; +import org.keycloak.json.StringOrArraySerializer; + import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.keycloak.json.StringOrArrayDeserializer; -import org.keycloak.json.StringOrArraySerializer; - -import java.util.HashMap; -import java.util.Map; /** * @author pedroigor diff --git a/core/src/main/java/org/keycloak/representations/VersionRepresentation.java b/core/src/main/java/org/keycloak/representations/VersionRepresentation.java index 3dd6e18103a..ed1f37c0c3b 100755 --- a/core/src/main/java/org/keycloak/representations/VersionRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/VersionRepresentation.java @@ -17,9 +17,10 @@ package org.keycloak.representations; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.common.Version; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Bill Burke * @version $Revision: 1 $ 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 d93c6d6db12..33da1b2b83e 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 @@ -17,11 +17,12 @@ package org.keycloak.representations.adapters.action; -import com.fasterxml.jackson.annotation.JsonIgnore; import org.keycloak.Token; import org.keycloak.TokenCategory; import org.keycloak.common.util.Time; +import com.fasterxml.jackson.annotation.JsonIgnore; + /** * Posted to managed client from admin server. * diff --git a/core/src/main/java/org/keycloak/representations/adapters/config/BaseAdapterConfig.java b/core/src/main/java/org/keycloak/representations/adapters/config/BaseAdapterConfig.java index 8cb01a0285c..0df460ded91 100755 --- a/core/src/main/java/org/keycloak/representations/adapters/config/BaseAdapterConfig.java +++ b/core/src/main/java/org/keycloak/representations/adapters/config/BaseAdapterConfig.java @@ -17,12 +17,12 @@ package org.keycloak.representations.adapters.config; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - import java.util.Map; import java.util.TreeMap; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + /** * Common Adapter configuration * diff --git a/core/src/main/java/org/keycloak/representations/adapters/config/PolicyEnforcerConfig.java b/core/src/main/java/org/keycloak/representations/adapters/config/PolicyEnforcerConfig.java index ec2016577e1..e5dc1ccb0c2 100644 --- a/core/src/main/java/org/keycloak/representations/adapters/config/PolicyEnforcerConfig.java +++ b/core/src/main/java/org/keycloak/representations/adapters/config/PolicyEnforcerConfig.java @@ -18,19 +18,19 @@ package org.keycloak.representations.adapters.config; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +import org.keycloak.representations.idm.authorization.ResourceRepresentation; +import org.keycloak.representations.idm.authorization.ScopeRepresentation; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import org.keycloak.representations.idm.authorization.ScopeRepresentation; - -import java.util.HashSet; -import java.util.Set; -import java.util.TreeMap; /** * @author Pedro Igor diff --git a/core/src/main/java/org/keycloak/representations/docker/DockerAccess.java b/core/src/main/java/org/keycloak/representations/docker/DockerAccess.java index f7a775c0979..ee34fa6b00c 100644 --- a/core/src/main/java/org/keycloak/representations/docker/DockerAccess.java +++ b/core/src/main/java/org/keycloak/representations/docker/DockerAccess.java @@ -1,12 +1,12 @@ package org.keycloak.representations.docker; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.Arrays; import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Per the docker auth v2 spec, access is defined like this: diff --git a/core/src/main/java/org/keycloak/representations/docker/DockerError.java b/core/src/main/java/org/keycloak/representations/docker/DockerError.java index cda1b88d7f1..8778063c53f 100644 --- a/core/src/main/java/org/keycloak/representations/docker/DockerError.java +++ b/core/src/main/java/org/keycloak/representations/docker/DockerError.java @@ -1,10 +1,10 @@ package org.keycloak.representations.docker; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.List; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * JSON Representation of a Docker Error in the following format: * diff --git a/core/src/main/java/org/keycloak/representations/docker/DockerErrorResponseToken.java b/core/src/main/java/org/keycloak/representations/docker/DockerErrorResponseToken.java index 3d961ce9468..9f6279a607c 100644 --- a/core/src/main/java/org/keycloak/representations/docker/DockerErrorResponseToken.java +++ b/core/src/main/java/org/keycloak/representations/docker/DockerErrorResponseToken.java @@ -1,9 +1,9 @@ package org.keycloak.representations.docker; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + public class DockerErrorResponseToken { diff --git a/core/src/main/java/org/keycloak/representations/docker/DockerResponseToken.java b/core/src/main/java/org/keycloak/representations/docker/DockerResponseToken.java index fe02a6459ce..576323acf11 100644 --- a/core/src/main/java/org/keycloak/representations/docker/DockerResponseToken.java +++ b/core/src/main/java/org/keycloak/representations/docker/DockerResponseToken.java @@ -1,11 +1,12 @@ package org.keycloak.representations.docker; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.representations.JsonWebToken; - import java.util.ArrayList; import java.util.List; +import org.keycloak.representations.JsonWebToken; + +import com.fasterxml.jackson.annotation.JsonProperty; + /** * * { * "iss": "auth.docker.com", diff --git a/core/src/main/java/org/keycloak/representations/dpop/DPoP.java b/core/src/main/java/org/keycloak/representations/dpop/DPoP.java index 726b96ef3e1..a1f5c2d8bf8 100644 --- a/core/src/main/java/org/keycloak/representations/dpop/DPoP.java +++ b/core/src/main/java/org/keycloak/representations/dpop/DPoP.java @@ -17,9 +17,10 @@ package org.keycloak.representations.dpop; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.representations.JsonWebToken; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Dmitry Telegin */ diff --git a/core/src/main/java/org/keycloak/representations/idm/AbstractUserRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/AbstractUserRepresentation.java index b17c72f360b..d3525606925 100644 --- a/core/src/main/java/org/keycloak/representations/idm/AbstractUserRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/AbstractUserRepresentation.java @@ -24,9 +24,10 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import org.keycloak.json.StringListMapDeserializer; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.keycloak.json.StringListMapDeserializer; public abstract class AbstractUserRepresentation { diff --git a/core/src/main/java/org/keycloak/representations/idm/AuthenticatorConfigInfoRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/AuthenticatorConfigInfoRepresentation.java index a26998b214c..14112a467e0 100644 --- a/core/src/main/java/org/keycloak/representations/idm/AuthenticatorConfigInfoRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/AuthenticatorConfigInfoRepresentation.java @@ -62,4 +62,3 @@ public class AuthenticatorConfigInfoRepresentation { this.properties = properties; } } - diff --git a/core/src/main/java/org/keycloak/representations/idm/ClientPoliciesRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/ClientPoliciesRepresentation.java index f2a076c707a..f749bc9b8ba 100644 --- a/core/src/main/java/org/keycloak/representations/idm/ClientPoliciesRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/ClientPoliciesRepresentation.java @@ -20,9 +20,10 @@ package org.keycloak.representations.idm; import java.util.ArrayList; import java.util.List; -import com.fasterxml.jackson.databind.JsonNode; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.databind.JsonNode; + /** * Client Policies' (the set of all Client Policy) external representation class * diff --git a/core/src/main/java/org/keycloak/representations/idm/ClientProfilesRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/ClientProfilesRepresentation.java index f3261814f81..c647d390f33 100644 --- a/core/src/main/java/org/keycloak/representations/idm/ClientProfilesRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/ClientProfilesRepresentation.java @@ -20,9 +20,10 @@ package org.keycloak.representations.idm; import java.util.ArrayList; import java.util.List; +import org.keycloak.util.JsonSerialization; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; -import org.keycloak.util.JsonSerialization; /** * Client Profiles' (the set of all Client Profile) external representation class diff --git a/core/src/main/java/org/keycloak/representations/idm/ClientRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/ClientRepresentation.java index 5aca8760357..f8957a35471 100755 --- a/core/src/main/java/org/keycloak/representations/idm/ClientRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/ClientRepresentation.java @@ -17,11 +17,11 @@ package org.keycloak.representations.idm; -import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; - import java.util.List; import java.util.Map; +import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/core/src/main/java/org/keycloak/representations/idm/ClientTemplateRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/ClientTemplateRepresentation.java index 3ad7cc4efd6..0bb8f5848d1 100755 --- a/core/src/main/java/org/keycloak/representations/idm/ClientTemplateRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/ClientTemplateRepresentation.java @@ -168,4 +168,3 @@ public class ClientTemplateRepresentation { this.attributes = attributes; } } - diff --git a/core/src/main/java/org/keycloak/representations/idm/OAuth2ErrorRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/OAuth2ErrorRepresentation.java index f9880139de7..0703fd4f18a 100644 --- a/core/src/main/java/org/keycloak/representations/idm/OAuth2ErrorRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/OAuth2ErrorRepresentation.java @@ -17,9 +17,10 @@ package org.keycloak.representations.idm; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.OAuth2Constants; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Marek Posolda */ diff --git a/core/src/main/java/org/keycloak/representations/idm/OrganizationRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/OrganizationRepresentation.java index 0c22cd50290..bd9faadbbfc 100644 --- a/core/src/main/java/org/keycloak/representations/idm/OrganizationRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/OrganizationRepresentation.java @@ -20,9 +20,9 @@ package org.keycloak.representations.idm; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.HashSet; import java.util.Set; public class OrganizationRepresentation { diff --git a/core/src/main/java/org/keycloak/representations/idm/PartialImportRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/PartialImportRepresentation.java index 9046d3da06f..357ca2de207 100644 --- a/core/src/main/java/org/keycloak/representations/idm/PartialImportRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/PartialImportRepresentation.java @@ -17,10 +17,10 @@ package org.keycloak.representations.idm; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + /** * Used for partial import of users, groups, clients, roles, and identity providers. * diff --git a/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java index e0314e34602..9d50abbfe55 100755 --- a/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/RealmRepresentation.java @@ -17,15 +17,6 @@ package org.keycloak.representations.idm; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.JsonNode; - -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.jboss.logging.Logger; -import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.util.JsonSerialization; - import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -34,6 +25,15 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.JsonNode; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.jboss.logging.Logger; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/core/src/main/java/org/keycloak/representations/idm/RequiredActionConfigInfoRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/RequiredActionConfigInfoRepresentation.java index 856ff92f934..791ff87cd39 100644 --- a/core/src/main/java/org/keycloak/representations/idm/RequiredActionConfigInfoRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/RequiredActionConfigInfoRepresentation.java @@ -34,4 +34,3 @@ public class RequiredActionConfigInfoRepresentation { this.properties = properties; } } - diff --git a/core/src/main/java/org/keycloak/representations/idm/SecurityProfileConfiguration.java b/core/src/main/java/org/keycloak/representations/idm/SecurityProfileConfiguration.java index 0da5f06ab73..eef78ac8bb9 100644 --- a/core/src/main/java/org/keycloak/representations/idm/SecurityProfileConfiguration.java +++ b/core/src/main/java/org/keycloak/representations/idm/SecurityProfileConfiguration.java @@ -16,9 +16,10 @@ */ package org.keycloak.representations.idm; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; /** * Default configuration for security profile. For the moment just a name and pointers diff --git a/core/src/main/java/org/keycloak/representations/idm/UserFederationMapperRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/UserFederationMapperRepresentation.java index 045cc9b0959..b9e4b2b4637 100644 --- a/core/src/main/java/org/keycloak/representations/idm/UserFederationMapperRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/UserFederationMapperRepresentation.java @@ -70,4 +70,3 @@ public class UserFederationMapperRepresentation { this.config = config; } } - diff --git a/core/src/main/java/org/keycloak/representations/idm/UserProfileMetadata.java b/core/src/main/java/org/keycloak/representations/idm/UserProfileMetadata.java index 13e2fd77e2d..8854ba7cd26 100644 --- a/core/src/main/java/org/keycloak/representations/idm/UserProfileMetadata.java +++ b/core/src/main/java/org/keycloak/representations/idm/UserProfileMetadata.java @@ -16,11 +16,11 @@ */ package org.keycloak.representations.idm; -import static java.util.Collections.emptyList; - import java.util.List; import java.util.Optional; +import static java.util.Collections.emptyList; + /** * @author Vlastimil Elias */ diff --git a/core/src/main/java/org/keycloak/representations/idm/authorization/AuthorizationSchema.java b/core/src/main/java/org/keycloak/representations/idm/authorization/AuthorizationSchema.java index 2d888d5cb4e..36b9447fa52 100644 --- a/core/src/main/java/org/keycloak/representations/idm/authorization/AuthorizationSchema.java +++ b/core/src/main/java/org/keycloak/representations/idm/authorization/AuthorizationSchema.java @@ -16,6 +16,13 @@ */ package org.keycloak.representations.idm.authorization; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonParser; @@ -25,13 +32,6 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - public class AuthorizationSchema { @JsonDeserialize(using = ResourceTypeDeserializer.class) @@ -66,4 +66,3 @@ public class AuthorizationSchema { } } } - diff --git a/core/src/main/java/org/keycloak/representations/idm/authorization/DecisionStrategy.java b/core/src/main/java/org/keycloak/representations/idm/authorization/DecisionStrategy.java index ace8ef51c99..1a4f2cf97bf 100644 --- a/core/src/main/java/org/keycloak/representations/idm/authorization/DecisionStrategy.java +++ b/core/src/main/java/org/keycloak/representations/idm/authorization/DecisionStrategy.java @@ -18,6 +18,7 @@ package org.keycloak.representations.idm.authorization; import java.util.Map; import java.util.Objects; + import org.keycloak.util.EnumWithStableIndex; /** diff --git a/core/src/main/java/org/keycloak/representations/idm/authorization/Logic.java b/core/src/main/java/org/keycloak/representations/idm/authorization/Logic.java index e66b147b849..a50ea157d19 100644 --- a/core/src/main/java/org/keycloak/representations/idm/authorization/Logic.java +++ b/core/src/main/java/org/keycloak/representations/idm/authorization/Logic.java @@ -18,6 +18,7 @@ package org.keycloak.representations.idm.authorization; import java.util.Map; import java.util.Objects; + import org.keycloak.util.EnumWithStableIndex; /** diff --git a/core/src/main/java/org/keycloak/representations/idm/authorization/PermissionRequest.java b/core/src/main/java/org/keycloak/representations/idm/authorization/PermissionRequest.java index e7b9b1be870..fbdf66f78d2 100644 --- a/core/src/main/java/org/keycloak/representations/idm/authorization/PermissionRequest.java +++ b/core/src/main/java/org/keycloak/representations/idm/authorization/PermissionRequest.java @@ -24,9 +24,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.keycloak.json.StringListMapDeserializer; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.keycloak.json.StringListMapDeserializer; /** * @author Pedro Igor diff --git a/core/src/main/java/org/keycloak/representations/idm/authorization/PermissionTicketToken.java b/core/src/main/java/org/keycloak/representations/idm/authorization/PermissionTicketToken.java index 9f2fa5a81af..18d5facc2a1 100644 --- a/core/src/main/java/org/keycloak/representations/idm/authorization/PermissionTicketToken.java +++ b/core/src/main/java/org/keycloak/representations/idm/authorization/PermissionTicketToken.java @@ -20,12 +20,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.keycloak.TokenIdGenerator; import org.keycloak.json.StringListMapDeserializer; import org.keycloak.representations.AccessToken; import org.keycloak.representations.JsonWebToken; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + /** * @author Pedro Igor */ diff --git a/core/src/main/java/org/keycloak/representations/idm/authorization/PolicyEnforcementMode.java b/core/src/main/java/org/keycloak/representations/idm/authorization/PolicyEnforcementMode.java index ee303b45541..871f7413d1e 100644 --- a/core/src/main/java/org/keycloak/representations/idm/authorization/PolicyEnforcementMode.java +++ b/core/src/main/java/org/keycloak/representations/idm/authorization/PolicyEnforcementMode.java @@ -18,6 +18,7 @@ package org.keycloak.representations.idm.authorization; import java.util.Map; import java.util.Objects; + import org.keycloak.util.EnumWithStableIndex; /** diff --git a/core/src/main/java/org/keycloak/representations/idm/authorization/PolicyEvaluationResponse.java b/core/src/main/java/org/keycloak/representations/idm/authorization/PolicyEvaluationResponse.java index ba5585c703d..70493d8bd5a 100644 --- a/core/src/main/java/org/keycloak/representations/idm/authorization/PolicyEvaluationResponse.java +++ b/core/src/main/java/org/keycloak/representations/idm/authorization/PolicyEvaluationResponse.java @@ -18,12 +18,12 @@ package org.keycloak.representations.idm.authorization; -import org.keycloak.representations.AccessToken; - import java.util.HashSet; import java.util.List; import java.util.Set; +import org.keycloak.representations.AccessToken; + /** * @author Pedro Igor */ diff --git a/core/src/main/java/org/keycloak/representations/idm/authorization/ResourceRepresentation.java b/core/src/main/java/org/keycloak/representations/idm/authorization/ResourceRepresentation.java index dc012bb8cbf..9f5f0a5e7bc 100644 --- a/core/src/main/java/org/keycloak/representations/idm/authorization/ResourceRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/idm/authorization/ResourceRepresentation.java @@ -24,12 +24,13 @@ import java.util.Map; import java.util.Objects; import java.util.Set; +import org.keycloak.json.StringListMapDeserializer; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSetter; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import org.keycloak.json.StringListMapDeserializer; /** *

One or more resources that the resource server manages as a set of protected resources. diff --git a/core/src/main/java/org/keycloak/representations/idm/authorization/ResourceType.java b/core/src/main/java/org/keycloak/representations/idm/authorization/ResourceType.java index ce48472fb22..4fb02903ce9 100644 --- a/core/src/main/java/org/keycloak/representations/idm/authorization/ResourceType.java +++ b/core/src/main/java/org/keycloak/representations/idm/authorization/ResourceType.java @@ -16,12 +16,13 @@ */ package org.keycloak.representations.idm.authorization; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Collections; import java.util.Map; import java.util.Set; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + public class ResourceType { private final String type; diff --git a/core/src/main/java/org/keycloak/representations/info/ServerInfoRepresentation.java b/core/src/main/java/org/keycloak/representations/info/ServerInfoRepresentation.java index a20bed5d73d..fdbafffceab 100755 --- a/core/src/main/java/org/keycloak/representations/info/ServerInfoRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/info/ServerInfoRepresentation.java @@ -17,14 +17,14 @@ package org.keycloak.representations.info; +import java.util.List; +import java.util.Map; + import org.keycloak.representations.idm.ComponentTypeRepresentation; import org.keycloak.representations.idm.PasswordPolicyTypeRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.ProtocolMapperTypeRepresentation; -import java.util.List; -import java.util.Map; - /** * @author Stian Thorgersen */ diff --git a/core/src/main/java/org/keycloak/representations/oidc/OIDCClientRepresentation.java b/core/src/main/java/org/keycloak/representations/oidc/OIDCClientRepresentation.java index 89d26247553..6d52f86b87f 100644 --- a/core/src/main/java/org/keycloak/representations/oidc/OIDCClientRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/oidc/OIDCClientRepresentation.java @@ -17,10 +17,11 @@ package org.keycloak.representations.oidc; -import com.fasterxml.jackson.annotation.JsonAutoDetect; +import java.util.List; + import org.keycloak.jose.jwk.JSONWebKeySet; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonAutoDetect; /** * @author Stian Thorgersen diff --git a/core/src/main/java/org/keycloak/representations/oidc/TokenMetadataRepresentation.java b/core/src/main/java/org/keycloak/representations/oidc/TokenMetadataRepresentation.java index 06d9ea98fe7..2bc784d3418 100644 --- a/core/src/main/java/org/keycloak/representations/oidc/TokenMetadataRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/oidc/TokenMetadataRepresentation.java @@ -16,9 +16,10 @@ */ package org.keycloak.representations.oidc; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.representations.AccessToken; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Pedro Igor */ diff --git a/core/src/main/java/org/keycloak/representations/userprofile/config/UPAttributePermissions.java b/core/src/main/java/org/keycloak/representations/userprofile/config/UPAttributePermissions.java index 69841d692f5..02925b1fa22 100644 --- a/core/src/main/java/org/keycloak/representations/userprofile/config/UPAttributePermissions.java +++ b/core/src/main/java/org/keycloak/representations/userprofile/config/UPAttributePermissions.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Objects; import java.util.Set; + import com.fasterxml.jackson.annotation.JsonIgnore; /** diff --git a/core/src/main/java/org/keycloak/representations/workflows/AbstractWorkflowComponentRepresentation.java b/core/src/main/java/org/keycloak/representations/workflows/AbstractWorkflowComponentRepresentation.java index 1d95bb0b921..b45409f9fed 100644 --- a/core/src/main/java/org/keycloak/representations/workflows/AbstractWorkflowComponentRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/workflows/AbstractWorkflowComponentRepresentation.java @@ -1,19 +1,20 @@ package org.keycloak.representations.workflows; -import static org.keycloak.common.util.reflections.Reflections.isArrayType; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_WITH; - import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.common.util.reflections.Reflections; + import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.common.util.reflections.Reflections; + +import static org.keycloak.common.util.reflections.Reflections.isArrayType; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_WITH; public abstract class AbstractWorkflowComponentRepresentation { diff --git a/core/src/main/java/org/keycloak/representations/workflows/MultivaluedHashMapValueDeserializer.java b/core/src/main/java/org/keycloak/representations/workflows/MultivaluedHashMapValueDeserializer.java index bccaac136ab..30ebe9c992c 100644 --- a/core/src/main/java/org/keycloak/representations/workflows/MultivaluedHashMapValueDeserializer.java +++ b/core/src/main/java/org/keycloak/representations/workflows/MultivaluedHashMapValueDeserializer.java @@ -3,11 +3,12 @@ package org.keycloak.representations.workflows; import java.io.IOException; import java.util.Map.Entry; +import org.keycloak.common.util.MultivaluedHashMap; + import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import org.keycloak.common.util.MultivaluedHashMap; public final class MultivaluedHashMapValueDeserializer extends JsonDeserializer { diff --git a/core/src/main/java/org/keycloak/representations/workflows/MultivaluedHashMapValueSerializer.java b/core/src/main/java/org/keycloak/representations/workflows/MultivaluedHashMapValueSerializer.java index 4773ddd4d78..38ca0bbc661 100644 --- a/core/src/main/java/org/keycloak/representations/workflows/MultivaluedHashMapValueSerializer.java +++ b/core/src/main/java/org/keycloak/representations/workflows/MultivaluedHashMapValueSerializer.java @@ -8,10 +8,11 @@ import java.util.Map.Entry; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.common.util.MultivaluedHashMap; + import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import org.keycloak.common.util.MultivaluedHashMap; public final class MultivaluedHashMapValueSerializer extends JsonSerializer> { diff --git a/core/src/main/java/org/keycloak/representations/workflows/WorkflowConcurrencyRepresentation.java b/core/src/main/java/org/keycloak/representations/workflows/WorkflowConcurrencyRepresentation.java index da190892c6e..8de619bc6b9 100644 --- a/core/src/main/java/org/keycloak/representations/workflows/WorkflowConcurrencyRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/workflows/WorkflowConcurrencyRepresentation.java @@ -1,9 +1,9 @@ package org.keycloak.representations.workflows; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; + import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_CANCEL_IF_RUNNING; public class WorkflowConcurrencyRepresentation { diff --git a/core/src/main/java/org/keycloak/representations/workflows/WorkflowRepresentation.java b/core/src/main/java/org/keycloak/representations/workflows/WorkflowRepresentation.java index 710be08898c..f0805f90476 100644 --- a/core/src/main/java/org/keycloak/representations/workflows/WorkflowRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/workflows/WorkflowRepresentation.java @@ -1,5 +1,20 @@ package org.keycloak.representations.workflows; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; + +import org.keycloak.common.util.MultivaluedHashMap; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_CANCEL_IF_RUNNING; import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_CONCURRENCY; import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_CONDITIONS; @@ -9,22 +24,8 @@ import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_NA import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_ON_EVENT; import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_STATE; import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_STEPS; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_WITH; import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_USES; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import org.keycloak.common.util.MultivaluedHashMap; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_WITH; @JsonPropertyOrder({"id", CONFIG_NAME, CONFIG_USES, CONFIG_ENABLED, CONFIG_ON_EVENT, CONFIG_CONCURRENCY, CONFIG_IF, CONFIG_STEPS, CONFIG_STATE}) @JsonIgnoreProperties(CONFIG_WITH) diff --git a/core/src/main/java/org/keycloak/representations/workflows/WorkflowStateRepresentation.java b/core/src/main/java/org/keycloak/representations/workflows/WorkflowStateRepresentation.java index 1e382024002..851c1ce87d9 100644 --- a/core/src/main/java/org/keycloak/representations/workflows/WorkflowStateRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/workflows/WorkflowStateRepresentation.java @@ -1,11 +1,12 @@ package org.keycloak.representations.workflows; -import static java.util.Optional.ofNullable; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_ERROR; - import java.util.Collections; import java.util.List; +import static java.util.Optional.ofNullable; + +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_ERROR; + public class WorkflowStateRepresentation { private List errors = Collections.emptyList(); diff --git a/core/src/main/java/org/keycloak/representations/workflows/WorkflowStepRepresentation.java b/core/src/main/java/org/keycloak/representations/workflows/WorkflowStepRepresentation.java index 43d29487bef..483d3dc9ba3 100644 --- a/core/src/main/java/org/keycloak/representations/workflows/WorkflowStepRepresentation.java +++ b/core/src/main/java/org/keycloak/representations/workflows/WorkflowStepRepresentation.java @@ -1,19 +1,20 @@ package org.keycloak.representations.workflows; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_AFTER; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_PRIORITY; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_USES; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_WITH; - import java.time.Duration; import java.util.Arrays; import java.util.Objects; +import org.keycloak.common.util.MultivaluedHashMap; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import org.keycloak.common.util.MultivaluedHashMap; + +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_AFTER; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_PRIORITY; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_USES; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_WITH; @JsonPropertyOrder({"id", CONFIG_USES, CONFIG_AFTER, CONFIG_PRIORITY, CONFIG_WITH}) @JsonInclude(JsonInclude.Include.NON_EMPTY) diff --git a/core/src/main/java/org/keycloak/sdjwt/JwkParsingUtils.java b/core/src/main/java/org/keycloak/sdjwt/JwkParsingUtils.java index e6025fb6462..9bb8b56d0a5 100644 --- a/core/src/main/java/org/keycloak/sdjwt/JwkParsingUtils.java +++ b/core/src/main/java/org/keycloak/sdjwt/JwkParsingUtils.java @@ -17,7 +17,8 @@ package org.keycloak.sdjwt; -import com.fasterxml.jackson.databind.JsonNode; +import java.util.Objects; + import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.AsymmetricSignatureVerifierContext; import org.keycloak.crypto.ECCurve; @@ -28,7 +29,7 @@ import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.jose.jwk.JWK; import org.keycloak.util.JWKSUtils; -import java.util.Objects; +import com.fasterxml.jackson.databind.JsonNode; /** * @author Ingrid Kamga diff --git a/core/src/main/java/org/keycloak/sdjwt/SdJwtFacade.java b/core/src/main/java/org/keycloak/sdjwt/SdJwtFacade.java index 4c9e719cf8a..d74b9213f44 100644 --- a/core/src/main/java/org/keycloak/sdjwt/SdJwtFacade.java +++ b/core/src/main/java/org/keycloak/sdjwt/SdJwtFacade.java @@ -16,12 +16,13 @@ */ package org.keycloak.sdjwt; -import com.fasterxml.jackson.databind.JsonNode; +import java.util.List; + import org.keycloak.common.VerificationException; import org.keycloak.crypto.SignatureSignerContext; import org.keycloak.crypto.SignatureVerifierContext; -import java.util.List; +import com.fasterxml.jackson.databind.JsonNode; /** * Simplified service for creating and managing SD-JWTs with easy-to-use methods. diff --git a/core/src/main/java/org/keycloak/sdjwt/SdJwtVerificationContext.java b/core/src/main/java/org/keycloak/sdjwt/SdJwtVerificationContext.java index def03df9ce1..7693fd3ad2a 100644 --- a/core/src/main/java/org/keycloak/sdjwt/SdJwtVerificationContext.java +++ b/core/src/main/java/org/keycloak/sdjwt/SdJwtVerificationContext.java @@ -17,16 +17,6 @@ package org.keycloak.sdjwt; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.jboss.logging.Logger; -import org.keycloak.common.VerificationException; -import org.keycloak.crypto.SignatureVerifierContext; -import org.keycloak.sdjwt.consumer.PresentationRequirements; -import org.keycloak.sdjwt.vp.KeyBindingJWT; -import org.keycloak.sdjwt.vp.KeyBindingJwtVerificationOpts; - import java.util.AbstractMap; import java.util.ArrayList; import java.util.Arrays; @@ -38,6 +28,17 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.common.VerificationException; +import org.keycloak.crypto.SignatureVerifierContext; +import org.keycloak.sdjwt.consumer.PresentationRequirements; +import org.keycloak.sdjwt.vp.KeyBindingJWT; +import org.keycloak.sdjwt.vp.KeyBindingJwtVerificationOpts; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.jboss.logging.Logger; + /** * Runs SD-JWT verification in isolation with only essential properties. * diff --git a/core/src/main/java/org/keycloak/sdjwt/TimeClaimVerifier.java b/core/src/main/java/org/keycloak/sdjwt/TimeClaimVerifier.java index 02431c729e8..0c93eccd04a 100644 --- a/core/src/main/java/org/keycloak/sdjwt/TimeClaimVerifier.java +++ b/core/src/main/java/org/keycloak/sdjwt/TimeClaimVerifier.java @@ -17,10 +17,11 @@ package org.keycloak.sdjwt; -import com.fasterxml.jackson.databind.JsonNode; +import java.time.Instant; + import org.keycloak.common.VerificationException; -import java.time.Instant; +import com.fasterxml.jackson.databind.JsonNode; /** * Module for checking the validity of JWT time claims. diff --git a/core/src/main/java/org/keycloak/sdjwt/consumer/HttpDataFetcher.java b/core/src/main/java/org/keycloak/sdjwt/consumer/HttpDataFetcher.java index 12cc8b4932c..23d0f217573 100644 --- a/core/src/main/java/org/keycloak/sdjwt/consumer/HttpDataFetcher.java +++ b/core/src/main/java/org/keycloak/sdjwt/consumer/HttpDataFetcher.java @@ -17,10 +17,10 @@ package org.keycloak.sdjwt.consumer; -import com.fasterxml.jackson.databind.JsonNode; - import java.io.IOException; +import com.fasterxml.jackson.databind.JsonNode; + /** * @author Ingrid Kamga */ diff --git a/core/src/main/java/org/keycloak/sdjwt/consumer/JwtVcMetadata.java b/core/src/main/java/org/keycloak/sdjwt/consumer/JwtVcMetadata.java index 51ce2f1e0c3..684015a589c 100644 --- a/core/src/main/java/org/keycloak/sdjwt/consumer/JwtVcMetadata.java +++ b/core/src/main/java/org/keycloak/sdjwt/consumer/JwtVcMetadata.java @@ -17,9 +17,10 @@ package org.keycloak.sdjwt.consumer; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.jose.jwk.JSONWebKeySet; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * POJO for JWT VC Metadata * diff --git a/core/src/main/java/org/keycloak/sdjwt/consumer/JwtVcMetadataTrustedSdJwtIssuer.java b/core/src/main/java/org/keycloak/sdjwt/consumer/JwtVcMetadataTrustedSdJwtIssuer.java index e7ed03831e1..e8016a24b68 100644 --- a/core/src/main/java/org/keycloak/sdjwt/consumer/JwtVcMetadataTrustedSdJwtIssuer.java +++ b/core/src/main/java/org/keycloak/sdjwt/consumer/JwtVcMetadataTrustedSdJwtIssuer.java @@ -17,17 +17,6 @@ package org.keycloak.sdjwt.consumer; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import org.keycloak.common.VerificationException; -import org.keycloak.crypto.SignatureVerifierContext; -import org.keycloak.jose.jwk.JSONWebKeySet; -import org.keycloak.jose.jwk.JWK; -import org.keycloak.sdjwt.IssuerSignedJWT; -import org.keycloak.sdjwt.JwkParsingUtils; -import org.keycloak.sdjwt.SdJws; -import org.keycloak.sdjwt.SdJwtUtils; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -38,6 +27,18 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.keycloak.common.VerificationException; +import org.keycloak.crypto.SignatureVerifierContext; +import org.keycloak.jose.jwk.JSONWebKeySet; +import org.keycloak.jose.jwk.JWK; +import org.keycloak.sdjwt.IssuerSignedJWT; +import org.keycloak.sdjwt.JwkParsingUtils; +import org.keycloak.sdjwt.SdJws; +import org.keycloak.sdjwt.SdJwtUtils; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; + /** * A trusted Issuer for running SD-JWT VP verification. * diff --git a/core/src/main/java/org/keycloak/sdjwt/consumer/PresentationRequirements.java b/core/src/main/java/org/keycloak/sdjwt/consumer/PresentationRequirements.java index bda0175e2ff..daabd34d2a4 100644 --- a/core/src/main/java/org/keycloak/sdjwt/consumer/PresentationRequirements.java +++ b/core/src/main/java/org/keycloak/sdjwt/consumer/PresentationRequirements.java @@ -17,9 +17,10 @@ package org.keycloak.sdjwt.consumer; -import com.fasterxml.jackson.databind.JsonNode; import org.keycloak.common.VerificationException; +import com.fasterxml.jackson.databind.JsonNode; + /** * Presentation requirements to constrain the kind of credential expected. * diff --git a/core/src/main/java/org/keycloak/sdjwt/consumer/SdJwtPresentationConsumer.java b/core/src/main/java/org/keycloak/sdjwt/consumer/SdJwtPresentationConsumer.java index 4087fd226e0..88f757b20b2 100644 --- a/core/src/main/java/org/keycloak/sdjwt/consumer/SdJwtPresentationConsumer.java +++ b/core/src/main/java/org/keycloak/sdjwt/consumer/SdJwtPresentationConsumer.java @@ -17,6 +17,9 @@ package org.keycloak.sdjwt.consumer; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.common.VerificationException; import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.sdjwt.IssuerSignedJWT; @@ -24,9 +27,6 @@ import org.keycloak.sdjwt.IssuerSignedJwtVerificationOpts; import org.keycloak.sdjwt.vp.KeyBindingJwtVerificationOpts; import org.keycloak.sdjwt.vp.SdJwtVP; -import java.util.ArrayList; -import java.util.List; - /** * A component for consuming (verifying) SD-JWT presentations. * diff --git a/core/src/main/java/org/keycloak/sdjwt/consumer/SimplePresentationDefinition.java b/core/src/main/java/org/keycloak/sdjwt/consumer/SimplePresentationDefinition.java index e874a9cd34c..e7c28002390 100644 --- a/core/src/main/java/org/keycloak/sdjwt/consumer/SimplePresentationDefinition.java +++ b/core/src/main/java/org/keycloak/sdjwt/consumer/SimplePresentationDefinition.java @@ -17,14 +17,15 @@ package org.keycloak.sdjwt.consumer; -import com.fasterxml.jackson.databind.JsonNode; -import org.keycloak.common.VerificationException; - import java.util.HashMap; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.keycloak.common.VerificationException; + +import com.fasterxml.jackson.databind.JsonNode; + /** * A simple presentation definition of the kind of credential expected. * diff --git a/core/src/main/java/org/keycloak/sdjwt/consumer/StaticTrustedSdJwtIssuer.java b/core/src/main/java/org/keycloak/sdjwt/consumer/StaticTrustedSdJwtIssuer.java index 2490b229c87..2d79a906b8a 100644 --- a/core/src/main/java/org/keycloak/sdjwt/consumer/StaticTrustedSdJwtIssuer.java +++ b/core/src/main/java/org/keycloak/sdjwt/consumer/StaticTrustedSdJwtIssuer.java @@ -17,11 +17,11 @@ package org.keycloak.sdjwt.consumer; +import java.util.List; + import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.sdjwt.IssuerSignedJWT; -import java.util.List; - /** * A trusted Issuer for running SD-JWT VP verification. * diff --git a/core/src/main/java/org/keycloak/sdjwt/consumer/TrustedSdJwtIssuer.java b/core/src/main/java/org/keycloak/sdjwt/consumer/TrustedSdJwtIssuer.java index f72020a50f3..6a4c2d2a61e 100644 --- a/core/src/main/java/org/keycloak/sdjwt/consumer/TrustedSdJwtIssuer.java +++ b/core/src/main/java/org/keycloak/sdjwt/consumer/TrustedSdJwtIssuer.java @@ -17,12 +17,12 @@ package org.keycloak.sdjwt.consumer; +import java.util.List; + import org.keycloak.common.VerificationException; import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.sdjwt.IssuerSignedJWT; -import java.util.List; - /** * A trusted Issuer for running SD-JWT VP verification. * diff --git a/core/src/main/java/org/keycloak/util/JWKSUtils.java b/core/src/main/java/org/keycloak/util/JWKSUtils.java index 6a1e8ec885e..c42999cc0a4 100644 --- a/core/src/main/java/org/keycloak/util/JWKSUtils.java +++ b/core/src/main/java/org/keycloak/util/JWKSUtils.java @@ -17,20 +17,6 @@ package org.keycloak.util; -import org.jboss.logging.Logger; -import org.keycloak.crypto.KeyUse; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.crypto.PublicKeysWrapper; -import org.keycloak.common.util.Base64Url; -import org.keycloak.crypto.KeyType; -import org.keycloak.jose.jwk.ECPublicJWK; -import org.keycloak.jose.jwk.JSONWebKeySet; -import org.keycloak.jose.jwk.JWK; -import org.keycloak.jose.jwk.JWKParser; -import org.keycloak.jose.jwk.OKPPublicJWK; -import org.keycloak.jose.jwk.RSAPublicJWK; -import org.keycloak.jose.jws.crypto.HashUtils; - import java.io.IOException; import java.security.PublicKey; import java.util.ArrayList; @@ -40,6 +26,21 @@ import java.util.Map; import java.util.TreeMap; import java.util.stream.Collectors; +import org.keycloak.common.util.Base64Url; +import org.keycloak.crypto.KeyType; +import org.keycloak.crypto.KeyUse; +import org.keycloak.crypto.KeyWrapper; +import org.keycloak.crypto.PublicKeysWrapper; +import org.keycloak.jose.jwk.ECPublicJWK; +import org.keycloak.jose.jwk.JSONWebKeySet; +import org.keycloak.jose.jwk.JWK; +import org.keycloak.jose.jwk.JWKParser; +import org.keycloak.jose.jwk.OKPPublicJWK; +import org.keycloak.jose.jwk.RSAPublicJWK; +import org.keycloak.jose.jws.crypto.HashUtils; + +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/core/src/main/java/org/keycloak/util/JsonSerialization.java b/core/src/main/java/org/keycloak/util/JsonSerialization.java index faa0d71c7a1..1b2b9d9872a 100755 --- a/core/src/main/java/org/keycloak/util/JsonSerialization.java +++ b/core/src/main/java/org/keycloak/util/JsonSerialization.java @@ -17,6 +17,10 @@ package org.keycloak.util; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.type.TypeReference; @@ -27,10 +31,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - /** * Utility class to handle simple JSON serializable for Keycloak. * diff --git a/core/src/main/java/org/keycloak/util/TokenUtil.java b/core/src/main/java/org/keycloak/util/TokenUtil.java index 9103c38d3dd..6df0f29a900 100644 --- a/core/src/main/java/org/keycloak/util/TokenUtil.java +++ b/core/src/main/java/org/keycloak/util/TokenUtil.java @@ -17,6 +17,9 @@ package org.keycloak.util; +import java.io.IOException; +import java.security.Key; + import org.keycloak.OAuth2Constants; import org.keycloak.jose.jwe.JWE; import org.keycloak.jose.jwe.JWEConstants; @@ -30,9 +33,6 @@ import org.keycloak.jose.jws.JWSInputException; import org.keycloak.representations.JsonWebToken; import org.keycloak.representations.RefreshToken; -import java.io.IOException; -import java.security.Key; - /** * @author Marek Posolda */ diff --git a/core/src/test/java/org/keycloak/AtHashTest.java b/core/src/test/java/org/keycloak/AtHashTest.java index a43f685596f..561f918aa24 100644 --- a/core/src/test/java/org/keycloak/AtHashTest.java +++ b/core/src/test/java/org/keycloak/AtHashTest.java @@ -17,11 +17,12 @@ package org.keycloak; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.crypto.Algorithm; import org.keycloak.jose.jws.crypto.HashUtils; +import org.junit.Assert; +import org.junit.Test; + /** * See "at_hash" in OIDC specification * diff --git a/core/src/test/java/org/keycloak/HashTest.java b/core/src/test/java/org/keycloak/HashTest.java index e3c8dda69a9..32cbf877435 100644 --- a/core/src/test/java/org/keycloak/HashTest.java +++ b/core/src/test/java/org/keycloak/HashTest.java @@ -22,9 +22,10 @@ package org.keycloak; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import org.keycloak.jose.jws.crypto.HashUtils; + import org.junit.Assert; import org.junit.Test; -import org.keycloak.jose.jws.crypto.HashUtils; /** * @author Marek Posolda diff --git a/core/src/test/java/org/keycloak/JsonParserTest.java b/core/src/test/java/org/keycloak/JsonParserTest.java index 2e8579f5d13..66a5ae5f7c7 100755 --- a/core/src/test/java/org/keycloak/JsonParserTest.java +++ b/core/src/test/java/org/keycloak/JsonParserTest.java @@ -17,8 +17,15 @@ package org.keycloak; -import org.junit.Assert; -import org.junit.Test; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.keycloak.common.util.ObjectUtil; import org.keycloak.representations.ClaimsRepresentation; import org.keycloak.representations.IDToken; @@ -31,14 +38,8 @@ import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.io.InputStream; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import org.junit.Assert; +import org.junit.Test; /** * @author Marek Posolda diff --git a/core/src/test/java/org/keycloak/KeyPairVerifierTest.java b/core/src/test/java/org/keycloak/KeyPairVerifierTest.java index adc35d5f541..ed88256e218 100644 --- a/core/src/test/java/org/keycloak/KeyPairVerifierTest.java +++ b/core/src/test/java/org/keycloak/KeyPairVerifierTest.java @@ -17,11 +17,12 @@ package org.keycloak; +import org.keycloak.common.VerificationException; +import org.keycloak.rule.CryptoInitRule; + import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.common.VerificationException; -import org.keycloak.rule.CryptoInitRule; /** * This is not tested in keycloak-core. The subclasses should be created in the crypto modules to make sure it is tested with corresponding modules (bouncycastle VS bouncycastle-fips) diff --git a/core/src/test/java/org/keycloak/RSAVerifierTest.java b/core/src/test/java/org/keycloak/RSAVerifierTest.java index e64ccbcd84c..33cb2e6ebc3 100755 --- a/core/src/test/java/org/keycloak/RSAVerifierTest.java +++ b/core/src/test/java/org/keycloak/RSAVerifierTest.java @@ -17,11 +17,14 @@ package org.keycloak; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Map; + import org.keycloak.common.VerificationException; import org.keycloak.common.util.CertificateUtils; import org.keycloak.common.util.Time; @@ -34,13 +37,11 @@ import org.keycloak.rule.CryptoInitRule; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.Base64; -import java.util.List; -import java.util.Map; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; /** * @author Bill Burke diff --git a/core/src/test/java/org/keycloak/SkeletonKeyTokenTest.java b/core/src/test/java/org/keycloak/SkeletonKeyTokenTest.java index be9ad843d80..79c25f73911 100755 --- a/core/src/test/java/org/keycloak/SkeletonKeyTokenTest.java +++ b/core/src/test/java/org/keycloak/SkeletonKeyTokenTest.java @@ -17,8 +17,13 @@ package org.keycloak; -import org.junit.Assert; -import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.security.KeyPair; +import java.security.KeyPairGenerator; + import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.crypto.RSAProvider; @@ -26,12 +31,8 @@ import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; import org.keycloak.util.JsonSerialization; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.security.KeyPair; -import java.security.KeyPairGenerator; +import org.junit.Assert; +import org.junit.Test; /** * @author Bill Burke diff --git a/core/src/test/java/org/keycloak/authentication/x509/CertificateIdentityExtractorTest.java b/core/src/test/java/org/keycloak/authentication/x509/CertificateIdentityExtractorTest.java index 7bb5fbabed3..5ad7e30a312 100644 --- a/core/src/test/java/org/keycloak/authentication/x509/CertificateIdentityExtractorTest.java +++ b/core/src/test/java/org/keycloak/authentication/x509/CertificateIdentityExtractorTest.java @@ -25,15 +25,16 @@ import java.security.Principal; import java.security.cert.X509Certificate; import java.util.function.Function; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.crypto.UserIdentityExtractor; import org.keycloak.common.util.PemUtils; import org.keycloak.common.util.StreamUtil; import org.keycloak.rule.CryptoInitRule; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Test; + import static org.junit.Assert.assertEquals; /** This is not tested in keycloak-core. The subclasses should be created in the crypto modules to make sure it is tested with corresponding modules (bouncycastle VS bouncycastle-fips) */ diff --git a/core/src/test/java/org/keycloak/jose/HmacTest.java b/core/src/test/java/org/keycloak/jose/HmacTest.java index b8041e1d757..f9d57459d41 100755 --- a/core/src/test/java/org/keycloak/jose/HmacTest.java +++ b/core/src/test/java/org/keycloak/jose/HmacTest.java @@ -17,19 +17,19 @@ package org.keycloak.jose; -import org.jboss.logging.Logger; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; +import java.util.UUID; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; + import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.crypto.HMACProvider; import org.keycloak.rule.CryptoInitRule; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; - -import java.util.UUID; +import org.jboss.logging.Logger; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Test; /** * @author Bill Burke diff --git a/core/src/test/java/org/keycloak/jose/JWETest.java b/core/src/test/java/org/keycloak/jose/JWETest.java index 0848fcd1d6f..be5d79d4769 100644 --- a/core/src/test/java/org/keycloak/jose/JWETest.java +++ b/core/src/test/java/org/keycloak/jose/JWETest.java @@ -17,10 +17,12 @@ package org.keycloak.jose; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Ignore; -import org.junit.Test; +import java.nio.charset.StandardCharsets; +import java.security.Key; +import java.security.KeyPair; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; + import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.KeyUtils; @@ -36,11 +38,10 @@ import org.keycloak.jose.jwe.enc.AesGcmJWEEncryptionProvider; import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; import org.keycloak.rule.CryptoInitRule; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; -import java.nio.charset.StandardCharsets; -import java.security.Key; -import java.security.KeyPair; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Ignore; +import org.junit.Test; /** * This is not tested in keycloak-core. The subclasses should be created in the crypto modules to make sure it is tested with corresponding modules (bouncycastle VS bouncycastle-fips) diff --git a/core/src/test/java/org/keycloak/jose/JsonWebTokenTest.java b/core/src/test/java/org/keycloak/jose/JsonWebTokenTest.java index 26c00bd0aa9..38380676dfc 100644 --- a/core/src/test/java/org/keycloak/jose/JsonWebTokenTest.java +++ b/core/src/test/java/org/keycloak/jose/JsonWebTokenTest.java @@ -17,12 +17,13 @@ package org.keycloak.jose; -import org.junit.Test; +import java.io.IOException; + import org.keycloak.common.util.Time; import org.keycloak.representations.JsonWebToken; import org.keycloak.util.JsonSerialization; -import java.io.IOException; +import org.junit.Test; import static junit.framework.TestCase.assertFalse; import static org.junit.Assert.assertArrayEquals; diff --git a/core/src/test/java/org/keycloak/jose/jwk/JWKTest.java b/core/src/test/java/org/keycloak/jose/jwk/JWKTest.java index 8bfff750c63..f63b016ef79 100644 --- a/core/src/test/java/org/keycloak/jose/jwk/JWKTest.java +++ b/core/src/test/java/org/keycloak/jose/jwk/JWKTest.java @@ -17,17 +17,6 @@ package org.keycloak.jose.jwk; -import org.junit.ClassRule; -import org.junit.Test; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.Base64Url; -import org.keycloak.common.util.KeyUtils; -import org.keycloak.common.util.PemUtils; -import org.keycloak.crypto.JavaAlgorithm; -import org.keycloak.crypto.KeyType; -import org.keycloak.rule.CryptoInitRule; -import org.keycloak.util.JsonSerialization; - import java.nio.charset.StandardCharsets; import java.security.KeyPair; import java.security.KeyPairGenerator; @@ -41,12 +30,25 @@ import java.security.spec.ECGenParameterSpec; import java.util.Arrays; import java.util.List; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.Base64Url; +import org.keycloak.common.util.KeyUtils; +import org.keycloak.common.util.PemUtils; +import org.keycloak.crypto.JavaAlgorithm; +import org.keycloak.crypto.KeyType; +import org.keycloak.rule.CryptoInitRule; +import org.keycloak.util.JsonSerialization; + +import org.junit.ClassRule; +import org.junit.Test; + +import static org.keycloak.common.util.CertificateUtils.generateV1SelfSignedCertificate; +import static org.keycloak.common.util.CertificateUtils.generateV3Certificate; + import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.common.util.CertificateUtils.generateV1SelfSignedCertificate; -import static org.keycloak.common.util.CertificateUtils.generateV3Certificate; /** * This is not tested in keycloak-core. The subclasses should be created in the crypto modules to make sure it is tested with corresponding modules (bouncycastle VS bouncycastle-fips) diff --git a/core/src/test/java/org/keycloak/jose/jwk/JWKUtilTest.java b/core/src/test/java/org/keycloak/jose/jwk/JWKUtilTest.java index 927c8c3b8e1..93c32b8df03 100644 --- a/core/src/test/java/org/keycloak/jose/jwk/JWKUtilTest.java +++ b/core/src/test/java/org/keycloak/jose/jwk/JWKUtilTest.java @@ -17,6 +17,7 @@ package org.keycloak.jose.jwk; import java.math.BigInteger; + import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/org/keycloak/json/StringListMapDeserializerTest.java b/core/src/test/java/org/keycloak/json/StringListMapDeserializerTest.java index 06ac5a2bc7f..d1cd4619c83 100644 --- a/core/src/test/java/org/keycloak/json/StringListMapDeserializerTest.java +++ b/core/src/test/java/org/keycloak/json/StringListMapDeserializerTest.java @@ -17,16 +17,16 @@ package org.keycloak.json; +import java.io.IOException; +import java.util.List; +import java.util.Map; + import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.junit.After; import org.junit.Before; import org.junit.Test; -import java.io.IOException; -import java.util.List; -import java.util.Map; - import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/core/src/test/java/org/keycloak/representations/workflows/WorkflowDefinitionTest.java b/core/src/test/java/org/keycloak/representations/workflows/WorkflowDefinitionTest.java index 7c4a573e946..3a9edf22f73 100644 --- a/core/src/test/java/org/keycloak/representations/workflows/WorkflowDefinitionTest.java +++ b/core/src/test/java/org/keycloak/representations/workflows/WorkflowDefinitionTest.java @@ -1,8 +1,5 @@ package org.keycloak.representations.workflows; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import java.io.IOException; import java.time.Duration; import java.util.Arrays; @@ -10,9 +7,13 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import org.junit.Test; import org.keycloak.util.JsonSerialization; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class WorkflowDefinitionTest { @Test diff --git a/core/src/test/java/org/keycloak/rule/CryptoInitRule.java b/core/src/test/java/org/keycloak/rule/CryptoInitRule.java index cfd63c155a7..5ed9bbb4f96 100644 --- a/core/src/test/java/org/keycloak/rule/CryptoInitRule.java +++ b/core/src/test/java/org/keycloak/rule/CryptoInitRule.java @@ -1,9 +1,10 @@ package org.keycloak.rule; -import org.junit.rules.ExternalResource; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.crypto.CryptoProvider; +import org.junit.rules.ExternalResource; + /** * @author Marek Posolda */ diff --git a/core/src/test/java/org/keycloak/sdjwt/ArrayElementDisclosureTest.java b/core/src/test/java/org/keycloak/sdjwt/ArrayElementDisclosureTest.java index 606046339e9..a10738d23aa 100644 --- a/core/src/test/java/org/keycloak/sdjwt/ArrayElementDisclosureTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/ArrayElementDisclosureTest.java @@ -16,11 +16,10 @@ */ package org.keycloak.sdjwt; -import static org.junit.Assert.assertEquals; - +import com.fasterxml.jackson.databind.JsonNode; import org.junit.Test; -import com.fasterxml.jackson.databind.JsonNode; +import static org.junit.Assert.assertEquals; /** * @author Francis Pouatcha diff --git a/core/src/test/java/org/keycloak/sdjwt/ArrayElementSerializationTest.java b/core/src/test/java/org/keycloak/sdjwt/ArrayElementSerializationTest.java index b7e6ef377af..f801a19d2c6 100644 --- a/core/src/test/java/org/keycloak/sdjwt/ArrayElementSerializationTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/ArrayElementSerializationTest.java @@ -16,13 +16,12 @@ */ package org.keycloak.sdjwt; -import static org.junit.Assert.assertEquals; - +import com.fasterxml.jackson.databind.node.TextNode; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.fasterxml.jackson.databind.node.TextNode; +import static org.junit.Assert.assertEquals; /** * @author Francis Pouatcha diff --git a/core/src/test/java/org/keycloak/sdjwt/IssuerSignedJWTTest.java b/core/src/test/java/org/keycloak/sdjwt/IssuerSignedJWTTest.java index 207fe917dcd..13dcb29e7c1 100644 --- a/core/src/test/java/org/keycloak/sdjwt/IssuerSignedJWTTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/IssuerSignedJWTTest.java @@ -16,18 +16,17 @@ */ package org.keycloak.sdjwt; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.junit.Test; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; /** * @author Francis Pouatcha diff --git a/core/src/test/java/org/keycloak/sdjwt/JsonClaimsetTest.java b/core/src/test/java/org/keycloak/sdjwt/JsonClaimsetTest.java index 33249a1f705..861151a3ef9 100644 --- a/core/src/test/java/org/keycloak/sdjwt/JsonClaimsetTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/JsonClaimsetTest.java @@ -16,15 +16,14 @@ */ package org.keycloak.sdjwt; -import static org.junit.Assert.assertEquals; - import java.io.IOException; import java.io.InputStream; -import org.junit.Test; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.JsonNodeType; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; /** * @author Francis Pouatcha diff --git a/core/src/test/java/org/keycloak/sdjwt/JsonNodeComparisonTest.java b/core/src/test/java/org/keycloak/sdjwt/JsonNodeComparisonTest.java index 9967a3029bb..2fbb5d42d65 100644 --- a/core/src/test/java/org/keycloak/sdjwt/JsonNodeComparisonTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/JsonNodeComparisonTest.java @@ -16,12 +16,11 @@ */ package org.keycloak.sdjwt; -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; /** * @author Francis Pouatcha diff --git a/core/src/test/java/org/keycloak/sdjwt/SdJWTSamplesTest.java b/core/src/test/java/org/keycloak/sdjwt/SdJWTSamplesTest.java index db54482fd0c..707a1c2760b 100644 --- a/core/src/test/java/org/keycloak/sdjwt/SdJWTSamplesTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/SdJWTSamplesTest.java @@ -16,12 +16,11 @@ */ package org.keycloak.sdjwt; -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; /** * @author Francis Pouatcha diff --git a/core/src/test/java/org/keycloak/sdjwt/SdJwsTest.java b/core/src/test/java/org/keycloak/sdjwt/SdJwsTest.java index 501fcf05757..9fc7b53f9e4 100644 --- a/core/src/test/java/org/keycloak/sdjwt/SdJwsTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/SdJwsTest.java @@ -17,20 +17,21 @@ package org.keycloak.sdjwt; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.ClassRule; -import org.junit.Test; -import org.keycloak.common.VerificationException; -import org.keycloak.rule.CryptoInitRule; - import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.Arrays; import java.util.Collections; import java.util.List; +import org.keycloak.common.VerificationException; +import org.keycloak.rule.CryptoInitRule; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.ClassRule; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThrows; diff --git a/core/src/test/java/org/keycloak/sdjwt/SdJwtFacadeTest.java b/core/src/test/java/org/keycloak/sdjwt/SdJwtFacadeTest.java index 180e2e07553..edfabbc51fe 100644 --- a/core/src/test/java/org/keycloak/sdjwt/SdJwtFacadeTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/SdJwtFacadeTest.java @@ -16,17 +16,18 @@ */ package org.keycloak.sdjwt; -import com.fasterxml.jackson.databind.JsonNode; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; +import java.util.Collections; +import java.util.List; + import org.keycloak.common.VerificationException; import org.keycloak.crypto.SignatureSignerContext; import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.rule.CryptoInitRule; -import java.util.Collections; -import java.util.List; +import com.fasterxml.jackson.databind.JsonNode; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/core/src/test/java/org/keycloak/sdjwt/SdJwtTest.java b/core/src/test/java/org/keycloak/sdjwt/SdJwtTest.java index 34c96a422cb..fac829dc461 100644 --- a/core/src/test/java/org/keycloak/sdjwt/SdJwtTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/SdJwtTest.java @@ -16,14 +16,14 @@ */ package org.keycloak.sdjwt; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; import org.keycloak.crypto.SignatureSignerContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * @author Francis Pouatcha diff --git a/core/src/test/java/org/keycloak/sdjwt/SdJwtUtilsTest.java b/core/src/test/java/org/keycloak/sdjwt/SdJwtUtilsTest.java index b6ca2abf8ea..42fe01f36df 100644 --- a/core/src/test/java/org/keycloak/sdjwt/SdJwtUtilsTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/SdJwtUtilsTest.java @@ -16,13 +16,14 @@ */ package org.keycloak.sdjwt; -import static org.junit.Assert.assertEquals; - import java.io.IOException; -import org.junit.Test; import org.keycloak.jose.jws.crypto.HashUtils; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + /** * @author Francis Pouatcha */ diff --git a/core/src/test/java/org/keycloak/sdjwt/SdJwtVerificationTest.java b/core/src/test/java/org/keycloak/sdjwt/SdJwtVerificationTest.java index 3ced44b7d92..986c755eaf4 100644 --- a/core/src/test/java/org/keycloak/sdjwt/SdJwtVerificationTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/SdJwtVerificationTest.java @@ -17,20 +17,21 @@ package org.keycloak.sdjwt; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.ClassRule; -import org.junit.Test; +import java.time.Instant; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import org.keycloak.common.VerificationException; import org.keycloak.crypto.SignatureSignerContext; import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.rule.CryptoInitRule; -import java.time.Instant; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.ClassRule; +import org.junit.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/core/src/test/java/org/keycloak/sdjwt/TimeClaimVerifierTest.java b/core/src/test/java/org/keycloak/sdjwt/TimeClaimVerifierTest.java index 64beaa7aa9f..fdf3b1eae68 100644 --- a/core/src/test/java/org/keycloak/sdjwt/TimeClaimVerifierTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/TimeClaimVerifierTest.java @@ -17,16 +17,18 @@ package org.keycloak.sdjwt; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.Test; import org.keycloak.common.VerificationException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.Test; + import static org.keycloak.sdjwt.TimeClaimVerifier.CLAIM_NAME_EXP; import static org.keycloak.sdjwt.TimeClaimVerifier.CLAIM_NAME_IAT; import static org.keycloak.sdjwt.TimeClaimVerifier.CLAIM_NAME_NBF; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertThrows; + /** * @author Ingrid Kamga */ diff --git a/core/src/test/java/org/keycloak/sdjwt/UndisclosedClaimTest.java b/core/src/test/java/org/keycloak/sdjwt/UndisclosedClaimTest.java index 8883a809c9a..3536706d764 100644 --- a/core/src/test/java/org/keycloak/sdjwt/UndisclosedClaimTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/UndisclosedClaimTest.java @@ -16,13 +16,12 @@ */ package org.keycloak.sdjwt; -import static org.junit.Assert.assertEquals; - +import com.fasterxml.jackson.databind.node.TextNode; import org.junit.After; import org.junit.Before; import org.junit.Test; -import com.fasterxml.jackson.databind.node.TextNode; +import static org.junit.Assert.assertEquals; /** * @author Francis Pouatcha diff --git a/core/src/test/java/org/keycloak/sdjwt/consumer/JwtVcMetadataTrustedSdJwtIssuerTest.java b/core/src/test/java/org/keycloak/sdjwt/consumer/JwtVcMetadataTrustedSdJwtIssuerTest.java index 7a4aeb8e2aa..3c01daca1eb 100644 --- a/core/src/test/java/org/keycloak/sdjwt/consumer/JwtVcMetadataTrustedSdJwtIssuerTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/consumer/JwtVcMetadataTrustedSdJwtIssuerTest.java @@ -17,11 +17,11 @@ package org.keycloak.sdjwt.consumer; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.ClassRule; -import org.junit.Test; +import java.rmi.UnknownHostException; +import java.util.Arrays; +import java.util.List; +import java.util.regex.Pattern; + import org.keycloak.common.VerificationException; import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.rule.CryptoInitRule; @@ -31,10 +31,11 @@ import org.keycloak.sdjwt.SdJwtUtils; import org.keycloak.sdjwt.TestUtils; import org.keycloak.sdjwt.vp.SdJwtVP; -import java.rmi.UnknownHostException; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Pattern; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.ClassRule; +import org.junit.Test; import static org.hamcrest.CoreMatchers.endsWith; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/core/src/test/java/org/keycloak/sdjwt/consumer/SdJwtPresentationConsumerTest.java b/core/src/test/java/org/keycloak/sdjwt/consumer/SdJwtPresentationConsumerTest.java index 6d402c5c7cd..063496ab5a8 100644 --- a/core/src/test/java/org/keycloak/sdjwt/consumer/SdJwtPresentationConsumerTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/consumer/SdJwtPresentationConsumerTest.java @@ -17,8 +17,10 @@ package org.keycloak.sdjwt.consumer; -import org.junit.ClassRule; -import org.junit.Test; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import org.keycloak.common.VerificationException; import org.keycloak.rule.CryptoInitRule; import org.keycloak.sdjwt.IssuerSignedJwtVerificationOpts; @@ -27,9 +29,8 @@ import org.keycloak.sdjwt.TestUtils; import org.keycloak.sdjwt.vp.KeyBindingJwtVerificationOpts; import org.keycloak.sdjwt.vp.SdJwtVP; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import org.junit.ClassRule; +import org.junit.Test; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; diff --git a/core/src/test/java/org/keycloak/sdjwt/consumer/SimplePresentationDefinitionTest.java b/core/src/test/java/org/keycloak/sdjwt/consumer/SimplePresentationDefinitionTest.java index aa4e682434d..41c5bd9c31d 100644 --- a/core/src/test/java/org/keycloak/sdjwt/consumer/SimplePresentationDefinitionTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/consumer/SimplePresentationDefinitionTest.java @@ -17,13 +17,14 @@ package org.keycloak.sdjwt.consumer; +import org.keycloak.common.VerificationException; +import org.keycloak.sdjwt.SdJwtUtils; +import org.keycloak.sdjwt.TestUtils; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; -import org.keycloak.common.VerificationException; -import org.keycloak.sdjwt.SdJwtUtils; -import org.keycloak.sdjwt.TestUtils; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/KeyBindingJwtVerificationOptsTest.java b/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/KeyBindingJwtVerificationOptsTest.java index 6cb7de33208..25ac6af0f7a 100644 --- a/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/KeyBindingJwtVerificationOptsTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/KeyBindingJwtVerificationOptsTest.java @@ -18,6 +18,7 @@ package org.keycloak.sdjwt.sdjwtvp; import org.keycloak.sdjwt.vp.KeyBindingJwtVerificationOpts; + import org.junit.Test; public class KeyBindingJwtVerificationOptsTest { diff --git a/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/SdJwtVPTest.java b/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/SdJwtVPTest.java index 6dab6631704..d4c5aeb22f9 100644 --- a/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/SdJwtVPTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/SdJwtVPTest.java @@ -16,10 +16,8 @@ */ package org.keycloak.sdjwt.sdjwtvp; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.ClassRule; -import org.junit.Test; +import java.util.Arrays; + import org.keycloak.common.VerificationException; import org.keycloak.rule.CryptoInitRule; import org.keycloak.sdjwt.DisclosureSpec; @@ -29,7 +27,10 @@ import org.keycloak.sdjwt.TestSettings; import org.keycloak.sdjwt.TestUtils; import org.keycloak.sdjwt.vp.SdJwtVP; -import java.util.Arrays; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.ClassRule; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/SdJwtVPVerificationTest.java b/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/SdJwtVPVerificationTest.java index ebbd4e9aae8..e8152b24cd8 100644 --- a/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/SdJwtVPVerificationTest.java +++ b/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/SdJwtVPVerificationTest.java @@ -17,11 +17,11 @@ package org.keycloak.sdjwt.sdjwtvp; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.ClassRule; -import org.junit.Test; +import java.time.Instant; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import org.keycloak.common.VerificationException; import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.rule.CryptoInitRule; @@ -33,18 +33,20 @@ import org.keycloak.sdjwt.vp.KeyBindingJWT; import org.keycloak.sdjwt.vp.KeyBindingJwtVerificationOpts; import org.keycloak.sdjwt.vp.SdJwtVP; -import java.time.Instant; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.ClassRule; +import org.junit.Test; + +import static org.keycloak.sdjwt.TimeClaimVerifier.CLAIM_NAME_EXP; +import static org.keycloak.sdjwt.TimeClaimVerifier.CLAIM_NAME_IAT; +import static org.keycloak.sdjwt.TimeClaimVerifier.CLAIM_NAME_NBF; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; -import static org.keycloak.sdjwt.TimeClaimVerifier.CLAIM_NAME_EXP; -import static org.keycloak.sdjwt.TimeClaimVerifier.CLAIM_NAME_IAT; -import static org.keycloak.sdjwt.TimeClaimVerifier.CLAIM_NAME_NBF; /** * @author Ingrid Kamga diff --git a/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/TestCompareSdJwt.java b/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/TestCompareSdJwt.java index 9b62aaee806..2c12332d779 100644 --- a/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/TestCompareSdJwt.java +++ b/core/src/test/java/org/keycloak/sdjwt/sdjwtvp/TestCompareSdJwt.java @@ -16,9 +16,6 @@ */ package org.keycloak.sdjwt.sdjwtvp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -34,6 +31,9 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonNode; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * This class will try to test conformity to the spec by comparing json objects. * We are facing the situation that: diff --git a/core/src/test/java/org/keycloak/util/JWKSUtilsTest.java b/core/src/test/java/org/keycloak/util/JWKSUtilsTest.java index c478a98372d..7c1cba7096b 100644 --- a/core/src/test/java/org/keycloak/util/JWKSUtilsTest.java +++ b/core/src/test/java/org/keycloak/util/JWKSUtilsTest.java @@ -17,8 +17,6 @@ package org.keycloak.util; -import org.junit.ClassRule; -import org.junit.Test; import org.keycloak.crypto.KeyUse; import org.keycloak.crypto.KeyWrapper; import org.keycloak.crypto.PublicKeysWrapper; @@ -27,6 +25,9 @@ import org.keycloak.jose.jwk.JSONWebKeySet; import org.keycloak.jose.jwk.JWK; import org.keycloak.rule.CryptoInitRule; +import org.junit.ClassRule; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThrows; diff --git a/core/src/test/java/org/keycloak/util/PemUtilsTest.java b/core/src/test/java/org/keycloak/util/PemUtilsTest.java index 83449a0589a..ec0edd412e1 100644 --- a/core/src/test/java/org/keycloak/util/PemUtilsTest.java +++ b/core/src/test/java/org/keycloak/util/PemUtilsTest.java @@ -7,15 +7,16 @@ import java.security.PublicKey; import java.security.cert.Certificate; import java.security.cert.X509Certificate; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; import org.keycloak.common.util.CertificateUtils; import org.keycloak.common.util.KeyUtils; import org.keycloak.common.util.PemException; import org.keycloak.common.util.PemUtils; import org.keycloak.rule.CryptoInitRule; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Test; + import static org.junit.Assert.assertEquals; public abstract class PemUtilsTest { diff --git a/core/src/test/java/org/keycloak/util/UriUtilsTest.java b/core/src/test/java/org/keycloak/util/UriUtilsTest.java index 5aba237f776..8f33509859e 100644 --- a/core/src/test/java/org/keycloak/util/UriUtilsTest.java +++ b/core/src/test/java/org/keycloak/util/UriUtilsTest.java @@ -17,9 +17,10 @@ package org.keycloak.util; -import org.junit.Test; import org.keycloak.common.util.UriUtils; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/crypto/default/src/main/java/org/keycloak/crypto/def/AesKeyWrapAlgorithmProvider.java b/crypto/default/src/main/java/org/keycloak/crypto/def/AesKeyWrapAlgorithmProvider.java index f623de86276..6aa90506f76 100644 --- a/crypto/default/src/main/java/org/keycloak/crypto/def/AesKeyWrapAlgorithmProvider.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/def/AesKeyWrapAlgorithmProvider.java @@ -19,15 +19,16 @@ package org.keycloak.crypto.def; import java.security.Key; -import org.bouncycastle.crypto.Wrapper; -import org.bouncycastle.crypto.engines.AESWrapEngine; -import org.bouncycastle.crypto.params.KeyParameter; import org.keycloak.jose.jwe.JWEHeader; import org.keycloak.jose.jwe.JWEHeader.JWEHeaderBuilder; import org.keycloak.jose.jwe.JWEKeyStorage; import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; +import org.bouncycastle.crypto.Wrapper; +import org.bouncycastle.crypto.engines.AESWrapEngine; +import org.bouncycastle.crypto.params.KeyParameter; + /** * @author Marek Posolda */ diff --git a/crypto/default/src/main/java/org/keycloak/crypto/def/BCCertificateUtilsProvider.java b/crypto/default/src/main/java/org/keycloak/crypto/def/BCCertificateUtilsProvider.java index af05b681724..e5b657a8e5c 100755 --- a/crypto/default/src/main/java/org/keycloak/crypto/def/BCCertificateUtilsProvider.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/def/BCCertificateUtilsProvider.java @@ -17,6 +17,26 @@ package org.keycloak.crypto.def; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.GeneralSecurityException; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.SecureRandom; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; + +import org.keycloak.common.crypto.CertificateUtilsProvider; +import org.keycloak.common.util.BouncyIntegration; +import org.keycloak.crypto.JavaAlgorithm; + import org.bouncycastle.asn1.ASN1InputStream; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.ASN1Sequence; @@ -47,25 +67,6 @@ import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils; import org.bouncycastle.operator.ContentSigner; import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.keycloak.common.util.BouncyIntegration; -import org.keycloak.common.crypto.CertificateUtilsProvider; -import org.keycloak.crypto.JavaAlgorithm; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.math.BigInteger; -import java.security.GeneralSecurityException; -import java.security.KeyPair; -import java.security.PrivateKey; -import java.security.SecureRandom; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; /** * The Class CertificateUtils provides utility functions for generation of V1 and V3 {@link X509Certificate} diff --git a/crypto/default/src/main/java/org/keycloak/crypto/def/BCECDSACryptoProvider.java b/crypto/default/src/main/java/org/keycloak/crypto/def/BCECDSACryptoProvider.java index 142380f9d63..0a90d6cf3ee 100644 --- a/crypto/default/src/main/java/org/keycloak/crypto/def/BCECDSACryptoProvider.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/def/BCECDSACryptoProvider.java @@ -1,5 +1,16 @@ package org.keycloak.crypto.def; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.KeyFactory; +import java.security.NoSuchAlgorithmException; +import java.security.interfaces.ECPrivateKey; +import java.security.interfaces.ECPublicKey; +import java.security.spec.InvalidKeySpecException; + +import org.keycloak.common.crypto.ECDSACryptoProvider; + import org.bouncycastle.asn1.ASN1InputStream; import org.bouncycastle.asn1.ASN1Integer; import org.bouncycastle.asn1.ASN1Primitive; @@ -10,16 +21,6 @@ import org.bouncycastle.jcajce.provider.asymmetric.ec.BCECPrivateKey; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.jce.spec.ECPublicKeySpec; import org.bouncycastle.math.ec.ECPoint; -import org.keycloak.common.crypto.ECDSACryptoProvider; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.math.BigInteger; -import java.security.KeyFactory; -import java.security.NoSuchAlgorithmException; -import java.security.interfaces.ECPrivateKey; -import java.security.interfaces.ECPublicKey; -import java.security.spec.InvalidKeySpecException; public class BCECDSACryptoProvider implements ECDSACryptoProvider { diff --git a/crypto/default/src/main/java/org/keycloak/crypto/def/BCEcdhEsAlgorithmProvider.java b/crypto/default/src/main/java/org/keycloak/crypto/def/BCEcdhEsAlgorithmProvider.java index ac450f0aa6f..a5c5a29c5ea 100644 --- a/crypto/default/src/main/java/org/keycloak/crypto/def/BCEcdhEsAlgorithmProvider.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/def/BCEcdhEsAlgorithmProvider.java @@ -37,18 +37,8 @@ import java.security.spec.ECParameterSpec; import java.security.spec.ECPoint; import java.security.spec.ECPublicKeySpec; import java.security.spec.InvalidKeySpecException; - import javax.crypto.KeyAgreement; -import org.bouncycastle.crypto.Wrapper; -import org.bouncycastle.crypto.agreement.kdf.ConcatenationKDFGenerator; -import org.bouncycastle.crypto.engines.AESWrapEngine; -import org.bouncycastle.crypto.params.KDFParameters; -import org.bouncycastle.crypto.params.KeyParameter; -import org.bouncycastle.crypto.util.DigestFactory; -import org.bouncycastle.jce.ECNamedCurveTable; -import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec; -import org.bouncycastle.jce.spec.ECNamedCurveSpec; import org.keycloak.common.util.Base64Url; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyType; @@ -60,6 +50,16 @@ import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; import org.keycloak.jose.jwk.ECPublicJWK; import org.keycloak.jose.jwk.JWKUtil; +import org.bouncycastle.crypto.Wrapper; +import org.bouncycastle.crypto.agreement.kdf.ConcatenationKDFGenerator; +import org.bouncycastle.crypto.engines.AESWrapEngine; +import org.bouncycastle.crypto.params.KDFParameters; +import org.bouncycastle.crypto.params.KeyParameter; +import org.bouncycastle.crypto.util.DigestFactory; +import org.bouncycastle.jce.ECNamedCurveTable; +import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec; +import org.bouncycastle.jce.spec.ECNamedCurveSpec; + /** * ECDH Ephemeral Static Algorithm Provider. * diff --git a/crypto/default/src/main/java/org/keycloak/crypto/def/BCOCSPProvider.java b/crypto/default/src/main/java/org/keycloak/crypto/def/BCOCSPProvider.java index 4bde6faa454..5ab7f4ff9da 100644 --- a/crypto/default/src/main/java/org/keycloak/crypto/def/BCOCSPProvider.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/def/BCOCSPProvider.java @@ -18,46 +18,6 @@ package org.keycloak.crypto.def; -import org.bouncycastle.asn1.ASN1IA5String; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.asn1.DERIA5String; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.Extensions; -import org.bouncycastle.asn1.x509.SubjectKeyIdentifier; -import org.bouncycastle.asn1.x509.KeyPurposeId; -import org.bouncycastle.asn1.x509.AuthorityInformationAccess; -import org.bouncycastle.asn1.x509.AccessDescription; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils; -import org.bouncycastle.cert.ocsp.BasicOCSPResp; -import org.bouncycastle.cert.ocsp.CertificateID; -import org.bouncycastle.cert.ocsp.CertificateStatus; -import org.bouncycastle.cert.ocsp.OCSPException; -import org.bouncycastle.cert.ocsp.OCSPReq; -import org.bouncycastle.cert.ocsp.OCSPReqBuilder; -import org.bouncycastle.cert.ocsp.OCSPResp; -import org.bouncycastle.cert.ocsp.RevokedStatus; -import org.bouncycastle.cert.ocsp.SingleResp; -import org.bouncycastle.cert.ocsp.UnknownStatus; -import org.bouncycastle.cert.ocsp.jcajce.JcaCertificateID; -import org.bouncycastle.operator.ContentVerifierProvider; -import org.bouncycastle.operator.DigestCalculator; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.keycloak.jose.jwe.JWEUtils; -import org.keycloak.common.util.BouncyIntegration; -import org.keycloak.models.KeycloakSession; -import org.keycloak.utils.OCSPProvider; - import java.io.IOException; import java.net.URI; import java.security.GeneralSecurityException; @@ -81,6 +41,47 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import org.keycloak.common.util.BouncyIntegration; +import org.keycloak.jose.jwe.JWEUtils; +import org.keycloak.models.KeycloakSession; +import org.keycloak.utils.OCSPProvider; + +import org.bouncycastle.asn1.ASN1IA5String; +import org.bouncycastle.asn1.ASN1InputStream; +import org.bouncycastle.asn1.ASN1Sequence; +import org.bouncycastle.asn1.DERIA5String; +import org.bouncycastle.asn1.DEROctetString; +import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers; +import org.bouncycastle.asn1.x500.X500Name; +import org.bouncycastle.asn1.x509.AccessDescription; +import org.bouncycastle.asn1.x509.AuthorityInformationAccess; +import org.bouncycastle.asn1.x509.Extension; +import org.bouncycastle.asn1.x509.Extensions; +import org.bouncycastle.asn1.x509.GeneralName; +import org.bouncycastle.asn1.x509.KeyPurposeId; +import org.bouncycastle.asn1.x509.SubjectKeyIdentifier; +import org.bouncycastle.cert.X509CertificateHolder; +import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; +import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; +import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils; +import org.bouncycastle.cert.ocsp.BasicOCSPResp; +import org.bouncycastle.cert.ocsp.CertificateID; +import org.bouncycastle.cert.ocsp.CertificateStatus; +import org.bouncycastle.cert.ocsp.OCSPException; +import org.bouncycastle.cert.ocsp.OCSPReq; +import org.bouncycastle.cert.ocsp.OCSPReqBuilder; +import org.bouncycastle.cert.ocsp.OCSPResp; +import org.bouncycastle.cert.ocsp.RevokedStatus; +import org.bouncycastle.cert.ocsp.SingleResp; +import org.bouncycastle.cert.ocsp.UnknownStatus; +import org.bouncycastle.cert.ocsp.jcajce.JcaCertificateID; +import org.bouncycastle.operator.ContentVerifierProvider; +import org.bouncycastle.operator.DigestCalculator; +import org.bouncycastle.operator.DigestCalculatorProvider; +import org.bouncycastle.operator.OperatorCreationException; +import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder; +import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; + /** * @author Peter Nalyvayko diff --git a/crypto/default/src/main/java/org/keycloak/crypto/def/BCPemUtilsProvider.java b/crypto/default/src/main/java/org/keycloak/crypto/def/BCPemUtilsProvider.java index d39a685babd..25af83089e4 100755 --- a/crypto/default/src/main/java/org/keycloak/crypto/def/BCPemUtilsProvider.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/def/BCPemUtilsProvider.java @@ -17,17 +17,18 @@ package org.keycloak.crypto.def; -import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; -import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter; -import org.bouncycastle.openssl.jcajce.JcaPEMWriter; -import org.keycloak.common.util.DerUtils; -import org.keycloak.common.util.PemException; -import org.keycloak.common.crypto.PemUtilsProvider; - import java.io.StringWriter; import java.security.PrivateKey; import java.security.PublicKey; +import org.keycloak.common.crypto.PemUtilsProvider; +import org.keycloak.common.util.DerUtils; +import org.keycloak.common.util.PemException; + +import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; +import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter; +import org.bouncycastle.openssl.jcajce.JcaPEMWriter; + /** * Encodes Key or Certificates to PEM format string * diff --git a/crypto/default/src/main/java/org/keycloak/crypto/def/BCUserIdentityExtractorProvider.java b/crypto/default/src/main/java/org/keycloak/crypto/def/BCUserIdentityExtractorProvider.java index 1e790a52c58..168502d9633 100644 --- a/crypto/default/src/main/java/org/keycloak/crypto/def/BCUserIdentityExtractorProvider.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/def/BCUserIdentityExtractorProvider.java @@ -18,6 +18,20 @@ package org.keycloak.crypto.def; +import java.io.ByteArrayInputStream; +import java.security.Principal; +import java.security.cert.CertificateParsingException; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Optional; +import java.util.function.Function; + +import org.keycloak.common.crypto.UserIdentityExtractor; +import org.keycloak.common.crypto.UserIdentityExtractorProvider; + import org.bouncycastle.asn1.ASN1Encodable; import org.bouncycastle.asn1.ASN1InputStream; import org.bouncycastle.asn1.ASN1ObjectIdentifier; @@ -32,19 +46,6 @@ import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x500.style.BCStyle; import org.bouncycastle.asn1.x500.style.IETFUtils; import org.jboss.logging.Logger; -import org.keycloak.common.crypto.UserIdentityExtractor; -import org.keycloak.common.crypto.UserIdentityExtractorProvider; - -import java.io.ByteArrayInputStream; -import java.security.Principal; -import java.security.cert.CertificateParsingException; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; -import java.util.function.Function; /** * @author Peter Nalyvayko diff --git a/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultCryptoProvider.java b/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultCryptoProvider.java index 3753692baf7..0f042af90b6 100644 --- a/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultCryptoProvider.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultCryptoProvider.java @@ -18,27 +18,27 @@ import java.security.cert.CollectionCertStoreParameters; import java.security.spec.ECParameterSpec; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; import javax.crypto.SecretKeyFactory; import javax.net.ssl.SSLSocketFactory; -import org.bouncycastle.jce.ECNamedCurveTable; -import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec; -import org.bouncycastle.jce.spec.ECNamedCurveSpec; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.jboss.logging.Logger; -import org.keycloak.common.crypto.CryptoProvider; -import org.keycloak.common.crypto.CryptoConstants; -import org.keycloak.common.crypto.ECDSACryptoProvider; import org.keycloak.common.crypto.CertificateUtilsProvider; +import org.keycloak.common.crypto.CryptoConstants; +import org.keycloak.common.crypto.CryptoProvider; +import org.keycloak.common.crypto.ECDSACryptoProvider; import org.keycloak.common.crypto.PemUtilsProvider; import org.keycloak.common.crypto.UserIdentityExtractorProvider; import org.keycloak.common.util.BouncyIntegration; import org.keycloak.common.util.KeystoreUtil.KeystoreFormat; import org.keycloak.crypto.JavaAlgorithm; +import org.bouncycastle.jce.ECNamedCurveTable; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec; +import org.bouncycastle.jce.spec.ECNamedCurveSpec; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultRsaKeyEncryption256JWEAlgorithmProvider.java b/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultRsaKeyEncryption256JWEAlgorithmProvider.java index 54878f0231f..e58ded299e2 100644 --- a/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultRsaKeyEncryption256JWEAlgorithmProvider.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultRsaKeyEncryption256JWEAlgorithmProvider.java @@ -4,7 +4,6 @@ import java.security.AlgorithmParameters; import java.security.Key; import java.security.spec.AlgorithmParameterSpec; import java.security.spec.MGF1ParameterSpec; - import javax.crypto.Cipher; import javax.crypto.spec.OAEPParameterSpec; import javax.crypto.spec.PSource; diff --git a/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultRsaKeyEncryptionJWEAlgorithmProvider.java b/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultRsaKeyEncryptionJWEAlgorithmProvider.java index f8875e2277c..3e4f9fa9a7d 100644 --- a/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultRsaKeyEncryptionJWEAlgorithmProvider.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/def/DefaultRsaKeyEncryptionJWEAlgorithmProvider.java @@ -1,11 +1,11 @@ package org.keycloak.crypto.def; import java.security.Key; - import javax.crypto.Cipher; + import org.keycloak.jose.jwe.JWEHeader; -import org.keycloak.jose.jwe.JWEKeyStorage; import org.keycloak.jose.jwe.JWEHeader.JWEHeaderBuilder; +import org.keycloak.jose.jwe.JWEKeyStorage; import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; diff --git a/crypto/default/src/main/java/org/keycloak/crypto/hash/Argon2PasswordHashProvider.java b/crypto/default/src/main/java/org/keycloak/crypto/hash/Argon2PasswordHashProvider.java index 00f8a247a6a..192d9e0f64a 100644 --- a/crypto/default/src/main/java/org/keycloak/crypto/hash/Argon2PasswordHashProvider.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/hash/Argon2PasswordHashProvider.java @@ -1,7 +1,12 @@ package org.keycloak.crypto.hash; -import org.bouncycastle.crypto.generators.Argon2BytesGenerator; -import org.jboss.logging.Logger; +import java.util.Base64; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Semaphore; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.credential.hash.PasswordHashProvider; import org.keycloak.credential.hash.Salt; @@ -11,12 +16,8 @@ import org.keycloak.models.credential.dto.PasswordCredentialData; import org.keycloak.models.credential.dto.PasswordSecretData; import org.keycloak.tracing.TracingProviderUtil; -import java.util.Base64; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Semaphore; +import org.bouncycastle.crypto.generators.Argon2BytesGenerator; +import org.jboss.logging.Logger; import static org.keycloak.crypto.hash.Argon2PasswordHashProviderFactory.MEMORY_KEY; import static org.keycloak.crypto.hash.Argon2PasswordHashProviderFactory.PARALLELISM_KEY; diff --git a/crypto/default/src/main/java/org/keycloak/crypto/hash/Argon2PasswordHashProviderFactory.java b/crypto/default/src/main/java/org/keycloak/crypto/hash/Argon2PasswordHashProviderFactory.java index 53a28907e71..d13eee213fb 100644 --- a/crypto/default/src/main/java/org/keycloak/crypto/hash/Argon2PasswordHashProviderFactory.java +++ b/crypto/default/src/main/java/org/keycloak/crypto/hash/Argon2PasswordHashProviderFactory.java @@ -1,5 +1,9 @@ package org.keycloak.crypto.hash; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.Semaphore; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.credential.hash.PasswordHashProvider; @@ -10,10 +14,6 @@ import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.Semaphore; - public class Argon2PasswordHashProviderFactory implements PasswordHashProviderFactory, EnvironmentDependentProviderFactory { public static final String ID = "argon2"; diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/BCECDSACryptoProviderTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/BCECDSACryptoProviderTest.java index 15afc3f2538..c277af7b500 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/BCECDSACryptoProviderTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/BCECDSACryptoProviderTest.java @@ -16,14 +16,6 @@ */ package org.keycloak.crypto.def.test; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.crypto.def.BCECDSACryptoProvider; -import org.keycloak.rule.CryptoInitRule; - import java.security.InvalidAlgorithmParameterException; import java.security.KeyPair; import java.security.KeyPairGenerator; @@ -34,6 +26,15 @@ import java.security.spec.ECGenParameterSpec; import java.util.Arrays; import java.util.Collection; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.crypto.def.BCECDSACryptoProvider; +import org.keycloak.rule.CryptoInitRule; + +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import static org.junit.Assert.assertEquals; @RunWith(Parameterized.class) diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/BCEcdhEsAlgorithmProviderTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/BCEcdhEsAlgorithmProviderTest.java index d57c5faa2f1..fe5f8154c34 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/BCEcdhEsAlgorithmProviderTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/BCEcdhEsAlgorithmProviderTest.java @@ -31,14 +31,6 @@ import java.security.spec.ECPrivateKeySpec; import java.security.spec.ECPublicKeySpec; import java.security.spec.InvalidKeySpecException; -import org.bouncycastle.jce.ECNamedCurveTable; -import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec; -import org.bouncycastle.jce.spec.ECNamedCurveSpec; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.Environment; import org.keycloak.crypto.Algorithm; @@ -49,6 +41,15 @@ import org.keycloak.jose.jwe.JWEException; import org.keycloak.jose.jwe.JWEHeader; import org.keycloak.rule.CryptoInitRule; +import org.bouncycastle.jce.ECNamedCurveTable; +import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec; +import org.bouncycastle.jce.spec.ECNamedCurveSpec; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; + public class BCEcdhEsAlgorithmProviderTest { @Before public void before() { diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/CryptoPerfTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/CryptoPerfTest.java index da5b6e4108a..4fcfd233b3d 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/CryptoPerfTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/CryptoPerfTest.java @@ -24,11 +24,6 @@ import java.security.PrivateKey; import java.security.PublicKey; import java.security.cert.Certificate; -import org.jboss.logging.Logger; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Ignore; -import org.junit.Test; import org.keycloak.RSATokenVerifier; import org.keycloak.common.util.CertificateUtils; import org.keycloak.common.util.KeyUtils; @@ -43,6 +38,12 @@ import org.keycloak.representations.AccessToken; import org.keycloak.rule.CryptoInitRule; import org.keycloak.util.TokenUtil; +import org.jboss.logging.Logger; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Ignore; +import org.junit.Test; + /** * Simple test just to test how long it takes to generate keys of specific size, Sign+Verify with keys of specific size etc. * diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCertificateIdentityExtractorTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCertificateIdentityExtractorTest.java index 1775092b8a4..41186337dd5 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCertificateIdentityExtractorTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCertificateIdentityExtractorTest.java @@ -19,11 +19,12 @@ package org.keycloak.crypto.def.test; -import org.junit.Assume; -import org.junit.Before; import org.keycloak.authentication.x509.CertificateIdentityExtractorTest; import org.keycloak.common.util.Environment; +import org.junit.Assume; +import org.junit.Before; + /** * @author Marek Posolda */ diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoHmacTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoHmacTest.java index fa9cae68841..2df9a421eb0 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoHmacTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoHmacTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.def.test; +import org.keycloak.common.util.Environment; +import org.keycloak.jose.HmacTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.jose.HmacTest; /** diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWETest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWETest.java index ca35ab64744..3640c0bde7c 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWETest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWETest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.def.test; +import org.keycloak.common.util.Environment; +import org.keycloak.jose.JWETest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.jose.JWETest; /** * Test with default security provider and non-fips bouncycastle diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWKSUtilsTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWKSUtilsTest.java index 06785c34a84..abe1d9dfdb3 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWKSUtilsTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWKSUtilsTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.def.test; +import org.keycloak.common.util.Environment; +import org.keycloak.util.JWKSUtilsTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.util.JWKSUtilsTest; /** * Test with bouncycastle security provider diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWKTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWKTest.java index 19be427ef5e..4871cecdf67 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWKTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoJWKTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.def.test; +import org.keycloak.common.util.Environment; +import org.keycloak.jose.jwk.JWKTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.jose.jwk.JWKTest; /** * Test with default security provider and non-fips bouncycastle diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoKeyPairVerifierTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoKeyPairVerifierTest.java index aba54545840..841daa1e452 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoKeyPairVerifierTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoKeyPairVerifierTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.def.test; +import org.keycloak.KeyPairVerifierTest; +import org.keycloak.common.util.Environment; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.KeyPairVerifierTest; -import org.keycloak.common.util.Environment; /** * Test with default security provider and non-fips bouncycastle diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoRSAVerifierTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoRSAVerifierTest.java index 2d8daf09776..0168007b4d9 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoRSAVerifierTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoRSAVerifierTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.def.test; +import org.keycloak.RSAVerifierTest; +import org.keycloak.common.util.Environment; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.RSAVerifierTest; -import org.keycloak.common.util.Environment; /** * Test with bouncycastle security provider diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoUnitTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoUnitTest.java index ea4394f2c61..6cad83ec114 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoUnitTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultCryptoUnitTest.java @@ -1,13 +1,14 @@ package org.keycloak.crypto.def.test; +import org.keycloak.common.crypto.CryptoConstants; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.crypto.def.AesKeyWrapAlgorithmProvider; +import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; +import org.keycloak.rule.CryptoInitRule; + import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.crypto.CryptoConstants; -import org.keycloak.crypto.def.AesKeyWrapAlgorithmProvider; -import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; -import org.keycloak.rule.CryptoInitRule; /** * @author Marek Posolda diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultKeyStoreTypesTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultKeyStoreTypesTest.java index 2b649ff7659..bff5f0595a2 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultKeyStoreTypesTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultKeyStoreTypesTest.java @@ -3,13 +3,14 @@ package org.keycloak.crypto.def.test; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.rule.CryptoInitRule; + import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.KeystoreUtil; -import org.keycloak.rule.CryptoInitRule; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultSecureRandomTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultSecureRandomTest.java index eb68d0776f5..0ed6fddcdd9 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultSecureRandomTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/DefaultSecureRandomTest.java @@ -2,15 +2,16 @@ package org.keycloak.crypto.def.test; import java.security.SecureRandom; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.Environment; +import org.keycloak.rule.CryptoInitRule; + import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Assume; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.Environment; -import org.keycloak.rule.CryptoInitRule; /** * @author Marek Posolda diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/PemUtilsBCTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/PemUtilsBCTest.java index 1e414de720a..5f60445a40b 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/PemUtilsBCTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/PemUtilsBCTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.def.test; +import org.keycloak.common.util.Environment; +import org.keycloak.util.PemUtilsTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.util.PemUtilsTest; public class PemUtilsBCTest extends PemUtilsTest { @@ -14,4 +15,3 @@ public class PemUtilsBCTest extends PemUtilsTest { } } - diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoJwtVcMetadataTrustedSdJwtIssuerTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoJwtVcMetadataTrustedSdJwtIssuerTest.java index 8e390b05acb..5115986e4ec 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoJwtVcMetadataTrustedSdJwtIssuerTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoJwtVcMetadataTrustedSdJwtIssuerTest.java @@ -17,11 +17,12 @@ package org.keycloak.crypto.def.test.sdjwt; -import org.junit.Assume; -import org.junit.Before; import org.keycloak.common.util.Environment; import org.keycloak.sdjwt.consumer.JwtVcMetadataTrustedSdJwtIssuerTest; +import org.junit.Assume; +import org.junit.Before; + /** * @author Ingrid Kamga */ diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwsTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwsTest.java index e99837421a0..7487d92d85e 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwsTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwsTest.java @@ -17,11 +17,12 @@ package org.keycloak.crypto.def.test.sdjwt; -import org.junit.Assume; -import org.junit.Before; import org.keycloak.common.util.Environment; import org.keycloak.sdjwt.SdJwsTest; +import org.junit.Assume; +import org.junit.Before; + /** * @author Ingrid Kamga */ diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtFacadeTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtFacadeTest.java index 8f38acecc62..f7e27bd68f1 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtFacadeTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtFacadeTest.java @@ -16,11 +16,12 @@ */ package org.keycloak.crypto.def.test.sdjwt; -import org.junit.Assume; -import org.junit.Before; import org.keycloak.common.util.Environment; import org.keycloak.sdjwt.SdJwtFacadeTest; +import org.junit.Assume; +import org.junit.Before; + /** * @author Rodrick Awambeng */ diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtPresentationConsumerTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtPresentationConsumerTest.java index f20ed440399..1d0fb30a582 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtPresentationConsumerTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtPresentationConsumerTest.java @@ -17,11 +17,12 @@ package org.keycloak.crypto.def.test.sdjwt; -import org.junit.Assume; -import org.junit.Before; import org.keycloak.common.util.Environment; import org.keycloak.sdjwt.consumer.SdJwtPresentationConsumerTest; +import org.junit.Assume; +import org.junit.Before; + /** * @author Ingrid Kamga */ diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVPTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVPTest.java index 9c0fb4119ba..05dda746ade 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVPTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVPTest.java @@ -16,11 +16,12 @@ */ package org.keycloak.crypto.def.test.sdjwt; -import org.junit.Assume; -import org.junit.Before; import org.keycloak.common.util.Environment; import org.keycloak.sdjwt.sdjwtvp.SdJwtVPTest; +import org.junit.Assume; +import org.junit.Before; + /** * Test with default security provider and non-fips bouncycastle * diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVPVerificationTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVPVerificationTest.java index 24c976c0dcd..b946f5ccbaa 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVPVerificationTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVPVerificationTest.java @@ -17,11 +17,12 @@ package org.keycloak.crypto.def.test.sdjwt; -import org.junit.Assume; -import org.junit.Before; import org.keycloak.common.util.Environment; import org.keycloak.sdjwt.sdjwtvp.SdJwtVPVerificationTest; +import org.junit.Assume; +import org.junit.Before; + /** * @author Ingrid Kamga */ diff --git a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVerificationTest.java b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVerificationTest.java index 9ea805af24e..e28e15a832d 100644 --- a/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVerificationTest.java +++ b/crypto/default/src/test/java/org/keycloak/crypto/def/test/sdjwt/DefaultCryptoSdJwtVerificationTest.java @@ -17,11 +17,12 @@ package org.keycloak.crypto.def.test.sdjwt; -import org.junit.Assume; -import org.junit.Before; import org.keycloak.common.util.Environment; import org.keycloak.sdjwt.SdJwtVerificationTest; +import org.junit.Assume; +import org.junit.Before; + /** * @author Ingrid Kamga */ diff --git a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/AesKeyWrapAlgorithmProvider.java b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/AesKeyWrapAlgorithmProvider.java index 0a5a3839588..513176cff0e 100644 --- a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/AesKeyWrapAlgorithmProvider.java +++ b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/AesKeyWrapAlgorithmProvider.java @@ -17,12 +17,11 @@ package org.keycloak.crypto.elytron; import java.security.Key; - import javax.crypto.Cipher; import org.keycloak.jose.jwe.JWEHeader; -import org.keycloak.jose.jwe.JWEKeyStorage; import org.keycloak.jose.jwe.JWEHeader.JWEHeaderBuilder; +import org.keycloak.jose.jwe.JWEKeyStorage; import org.keycloak.jose.jwe.JWEKeyStorage.KeyUse; import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; diff --git a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronCertificateUtilsProvider.java b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronCertificateUtilsProvider.java index 273e0b205b0..f88aa2fd908 100644 --- a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronCertificateUtilsProvider.java +++ b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronCertificateUtilsProvider.java @@ -33,11 +33,11 @@ import java.util.Calendar; import java.util.Collections; import java.util.Date; import java.util.List; - import javax.security.auth.x500.X500Principal; -import org.jboss.logging.Logger; import org.keycloak.common.crypto.CertificateUtilsProvider; + +import org.jboss.logging.Logger; import org.wildfly.security.asn1.ASN1; import org.wildfly.security.asn1.DERDecoder; import org.wildfly.security.x500.GeneralName; diff --git a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronECDSACryptoProvider.java b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronECDSACryptoProvider.java index 855de2d3ed6..9c2493e5e4d 100644 --- a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronECDSACryptoProvider.java +++ b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronECDSACryptoProvider.java @@ -21,8 +21,9 @@ import java.math.BigInteger; import java.security.interfaces.ECPrivateKey; import java.security.interfaces.ECPublicKey; -import org.jboss.logging.Logger; import org.keycloak.common.crypto.ECDSACryptoProvider; + +import org.jboss.logging.Logger; import org.wildfly.security.asn1.DERDecoder; import org.wildfly.security.asn1.DEREncoder; diff --git a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronEcdhEsAlgorithmProvider.java b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronEcdhEsAlgorithmProvider.java index 436d7c8125d..960760a675e 100644 --- a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronEcdhEsAlgorithmProvider.java +++ b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronEcdhEsAlgorithmProvider.java @@ -33,15 +33,10 @@ import java.security.SecureRandom; import java.security.interfaces.ECPrivateKey; import java.security.interfaces.ECPublicKey; import java.security.spec.ECParameterSpec; - import javax.crypto.Cipher; import javax.crypto.KeyAgreement; import javax.crypto.spec.SecretKeySpec; -import org.jose4j.jwe.kdf.ConcatKeyDerivationFunction; -import org.jose4j.keys.EcKeyUtil; -import org.jose4j.keys.EllipticCurves; -import org.jose4j.lang.JoseException; import org.keycloak.common.util.Base64Url; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyType; @@ -53,6 +48,11 @@ import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; import org.keycloak.jose.jwk.ECPublicJWK; import org.keycloak.jose.jwk.JWKUtil; +import org.jose4j.jwe.kdf.ConcatKeyDerivationFunction; +import org.jose4j.keys.EcKeyUtil; +import org.jose4j.keys.EllipticCurves; +import org.jose4j.lang.JoseException; + /** * ECDH Ephemeral Static Algorithm Provider. * diff --git a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronOCSPProvider.java b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronOCSPProvider.java index 49701999ece..c72ad1436da 100644 --- a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronOCSPProvider.java +++ b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronOCSPProvider.java @@ -42,10 +42,10 @@ import java.util.EnumSet; import java.util.LinkedList; import java.util.List; - -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.utils.OCSPProvider; + +import org.jboss.logging.Logger; import org.wildfly.security.asn1.ASN1; import org.wildfly.security.asn1.DERDecoder; import org.wildfly.security.x500.X500; diff --git a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronPEMUtilsProvider.java b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronPEMUtilsProvider.java index f005469a39c..5fe976bca35 100644 --- a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronPEMUtilsProvider.java +++ b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronPEMUtilsProvider.java @@ -22,11 +22,12 @@ import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.util.Base64; -import org.jboss.logging.Logger; import org.keycloak.common.crypto.PemUtilsProvider; import org.keycloak.common.util.DerUtils; import org.keycloak.common.util.PemException; +import org.jboss.logging.Logger; + /** * @author David Anderson */ diff --git a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronRsaKeyEncryption256JWEAlgorithmProvider.java b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronRsaKeyEncryption256JWEAlgorithmProvider.java index a80c60ea1d8..3319be01d46 100644 --- a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronRsaKeyEncryption256JWEAlgorithmProvider.java +++ b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronRsaKeyEncryption256JWEAlgorithmProvider.java @@ -20,7 +20,6 @@ import java.security.AlgorithmParameters; import java.security.Key; import java.security.spec.AlgorithmParameterSpec; import java.security.spec.MGF1ParameterSpec; - import javax.crypto.Cipher; import javax.crypto.spec.OAEPParameterSpec; import javax.crypto.spec.PSource; diff --git a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronRsaKeyEncryptionJWEAlgorithmProvider.java b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronRsaKeyEncryptionJWEAlgorithmProvider.java index 94e0b6f1525..7833fb399db 100644 --- a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronRsaKeyEncryptionJWEAlgorithmProvider.java +++ b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronRsaKeyEncryptionJWEAlgorithmProvider.java @@ -17,12 +17,11 @@ package org.keycloak.crypto.elytron; import java.security.Key; - import javax.crypto.Cipher; import org.keycloak.jose.jwe.JWEHeader; -import org.keycloak.jose.jwe.JWEKeyStorage; import org.keycloak.jose.jwe.JWEHeader.JWEHeaderBuilder; +import org.keycloak.jose.jwe.JWEKeyStorage; import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; diff --git a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronUserIdentityExtractorProvider.java b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronUserIdentityExtractorProvider.java index 3b6088da9a7..a10d0b17f40 100644 --- a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronUserIdentityExtractorProvider.java +++ b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/ElytronUserIdentityExtractorProvider.java @@ -26,9 +26,10 @@ import java.util.Iterator; import java.util.List; import java.util.function.Function; -import org.jboss.logging.Logger; import org.keycloak.common.crypto.UserIdentityExtractor; import org.keycloak.common.crypto.UserIdentityExtractorProvider; + +import org.jboss.logging.Logger; import org.wildfly.security.asn1.ASN1; import org.wildfly.security.asn1.DERDecoder; import org.wildfly.security.asn1.OidsUtil; diff --git a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/WildFlyElytronProvider.java b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/WildFlyElytronProvider.java index 6c5d0e03661..60506791ed6 100644 --- a/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/WildFlyElytronProvider.java +++ b/crypto/elytron/src/main/java/org/keycloak/crypto/elytron/WildFlyElytronProvider.java @@ -37,7 +37,6 @@ import java.security.spec.MGF1ParameterSpec; import java.security.spec.PSSParameterSpec; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; import javax.crypto.SecretKeyFactory; diff --git a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/CRLDistributionPointTest.java b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/CRLDistributionPointTest.java index f3ee9a1494d..16f34f144ec 100644 --- a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/CRLDistributionPointTest.java +++ b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/CRLDistributionPointTest.java @@ -16,8 +16,6 @@ */ package org.keycloak.crypto.elytron.test; -import static org.junit.Assert.assertArrayEquals; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.security.KeyPair; @@ -28,11 +26,11 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.List; - import javax.security.auth.x500.X500Principal; -import org.junit.Test; import org.keycloak.crypto.elytron.ElytronCertificateUtilsProvider; + +import org.junit.Test; import org.wildfly.security.x500.GeneralName; import org.wildfly.security.x500.cert.CRLDistributionPoint; import org.wildfly.security.x500.cert.CRLDistributionPoint.DistributionPointName; @@ -40,6 +38,8 @@ import org.wildfly.security.x500.cert.CRLDistributionPoint.FullNameDistributionP import org.wildfly.security.x500.cert.CRLDistributionPointsExtension; import org.wildfly.security.x500.cert.X509CertificateBuilder; +import static org.junit.Assert.assertArrayEquals; + /** * @author David Anderson */ diff --git a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronCryptoJWETest.java b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronCryptoJWETest.java index f3e5aa3333e..5067db750ff 100644 --- a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronCryptoJWETest.java +++ b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronCryptoJWETest.java @@ -19,10 +19,11 @@ package org.keycloak.crypto.elytron.test; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; -import org.junit.Test; import org.keycloak.jose.JWETest; import org.keycloak.jose.jwe.JWEConstants; +import org.junit.Test; + public class ElytronCryptoJWETest extends JWETest { @Test diff --git a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronEcdhEsAlgorithmProviderTest.java b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronEcdhEsAlgorithmProviderTest.java index b07eeceb162..2e7e78a9fbe 100644 --- a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronEcdhEsAlgorithmProviderTest.java +++ b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronEcdhEsAlgorithmProviderTest.java @@ -26,12 +26,6 @@ import java.security.PrivateKey; import java.security.PublicKey; import java.security.spec.InvalidKeySpecException; -import org.jose4j.keys.EcKeyUtil; -import org.jose4j.keys.EllipticCurves; -import org.jose4j.lang.JoseException; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; import org.keycloak.common.util.Base64Url; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.elytron.ElytronEcdhEsAlgorithmProvider; @@ -41,6 +35,13 @@ import org.keycloak.jose.jwe.JWEException; import org.keycloak.jose.jwe.JWEHeader; import org.keycloak.rule.CryptoInitRule; +import org.jose4j.keys.EcKeyUtil; +import org.jose4j.keys.EllipticCurves; +import org.jose4j.lang.JoseException; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Test; + public class ElytronEcdhEsAlgorithmProviderTest { @ClassRule public static CryptoInitRule cryptoInitRule = new CryptoInitRule(); diff --git a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronHmacTest.java b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronHmacTest.java index 34212aa892a..28f6f3901a1 100644 --- a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronHmacTest.java +++ b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronHmacTest.java @@ -18,17 +18,17 @@ package org.keycloak.crypto.elytron.test; import java.security.SecureRandom; import java.util.UUID; - import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.jose.HmacTest; import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.crypto.HMACProvider; +import org.junit.Assert; +import org.junit.Test; + /** * @author David Anderson diff --git a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronKeyPairVerifierTest.java b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronKeyPairVerifierTest.java index 5d9ee6d468d..1421710e4ba 100644 --- a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronKeyPairVerifierTest.java +++ b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronKeyPairVerifierTest.java @@ -16,9 +16,10 @@ */ package org.keycloak.crypto.elytron.test; -import org.junit.Before; import org.keycloak.KeyPairVerifierTest; +import org.junit.Before; + /** * Test with default security provider and non-fips bouncycastle * diff --git a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronKeyStoreTypesTest.java b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronKeyStoreTypesTest.java index d3be5db2a94..09eed33cc8b 100644 --- a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronKeyStoreTypesTest.java +++ b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronKeyStoreTypesTest.java @@ -22,13 +22,14 @@ package org.keycloak.crypto.elytron.test; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.rule.CryptoInitRule; + import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.KeystoreUtil; -import org.keycloak.rule.CryptoInitRule; /** * @author Marek Posolda diff --git a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronOCSPPoviderTest.java b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronOCSPPoviderTest.java index 631dcd8e1e4..09edc94ce92 100644 --- a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronOCSPPoviderTest.java +++ b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronOCSPPoviderTest.java @@ -16,8 +16,6 @@ */ package org.keycloak.crypto.elytron.test; -import static org.junit.Assert.assertEquals; - import java.io.IOException; import java.net.URISyntaxException; import java.security.InvalidAlgorithmParameterException; @@ -30,16 +28,18 @@ import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.List; - import javax.security.auth.x500.X500Principal; -import org.junit.Test; import org.keycloak.crypto.elytron.ElytronOCSPProvider; + +import org.junit.Test; import org.wildfly.security.x500.GeneralName; import org.wildfly.security.x500.cert.AccessDescription; import org.wildfly.security.x500.cert.AuthorityInformationAccessExtension; import org.wildfly.security.x500.cert.X509CertificateBuilder; +import static org.junit.Assert.assertEquals; + /** * @author David Anderson */ diff --git a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronPemUtilsTest.java b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronPemUtilsTest.java index 862ec91b923..d3582461448 100644 --- a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronPemUtilsTest.java +++ b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronPemUtilsTest.java @@ -16,18 +16,19 @@ */ package org.keycloak.crypto.elytron.test; -import static org.junit.Assert.assertEquals; - import java.security.KeyPair; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; -import org.junit.ClassRule; -import org.junit.Test; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.crypto.PemUtilsProvider; import org.keycloak.rule.CryptoInitRule; +import org.junit.ClassRule; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + public class ElytronPemUtilsTest { @ClassRule @@ -68,4 +69,3 @@ public class ElytronPemUtilsTest { pemutil.decodePrivateKey(key); } } - diff --git a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronSecureRandomTest.java b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronSecureRandomTest.java index eddb5a40f6b..d4bd15a8801 100644 --- a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronSecureRandomTest.java +++ b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronSecureRandomTest.java @@ -18,12 +18,13 @@ package org.keycloak.crypto.elytron.test; import java.security.SecureRandom; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.rule.CryptoInitRule; + import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.rule.CryptoInitRule; /** * @author Marek Posolda diff --git a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronSignatureAlgTest.java b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronSignatureAlgTest.java index 5da02c9d3a8..8bf078233ef 100644 --- a/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronSignatureAlgTest.java +++ b/crypto/elytron/src/test/java/org/keycloak/crypto/elytron/test/ElytronSignatureAlgTest.java @@ -15,9 +15,10 @@ import java.security.spec.MGF1ParameterSpec; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.PSSParameterSpec; -import org.junit.Test; import org.keycloak.crypto.KeyWrapper; +import org.junit.Test; + public class ElytronSignatureAlgTest { private byte[] data = "Test String to Encrypt".getBytes(); diff --git a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/AbstractDelegatingSSLSocket.java b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/AbstractDelegatingSSLSocket.java index 30f1012f294..80b3947b5dc 100644 --- a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/AbstractDelegatingSSLSocket.java +++ b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/AbstractDelegatingSSLSocket.java @@ -28,7 +28,6 @@ import java.net.SocketException; import java.nio.channels.SocketChannel; import java.util.List; import java.util.function.BiFunction; - import javax.net.ssl.HandshakeCompletedListener; import javax.net.ssl.SSLParameters; import javax.net.ssl.SSLSession; @@ -315,4 +314,3 @@ abstract class AbstractDelegatingSSLSocket extends SSLSocket { return delegate; } } - diff --git a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSCertificateUtilsProvider.java b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSCertificateUtilsProvider.java index 51e12e096c5..28c8bb0c471 100755 --- a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSCertificateUtilsProvider.java +++ b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSCertificateUtilsProvider.java @@ -17,6 +17,26 @@ package org.keycloak.crypto.fips; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.math.BigInteger; +import java.security.GeneralSecurityException; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.SecureRandom; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collections; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; + +import org.keycloak.common.crypto.CertificateUtilsProvider; +import org.keycloak.common.util.BouncyIntegration; +import org.keycloak.crypto.JavaAlgorithm; + import org.bouncycastle.asn1.ASN1InputStream; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.ASN1Sequence; @@ -47,25 +67,6 @@ import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils; import org.bouncycastle.operator.ContentSigner; import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; -import org.keycloak.common.util.BouncyIntegration; -import org.keycloak.common.crypto.CertificateUtilsProvider; -import org.keycloak.crypto.JavaAlgorithm; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.math.BigInteger; -import java.security.GeneralSecurityException; -import java.security.KeyPair; -import java.security.PrivateKey; -import java.security.SecureRandom; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collections; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; /** * The Class CertificateUtils provides utility functions for generation of V1 and V3 {@link X509Certificate} diff --git a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSECDSACryptoProvider.java b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSECDSACryptoProvider.java index 401bb5d3524..c2dba7e4d08 100644 --- a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSECDSACryptoProvider.java +++ b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSECDSACryptoProvider.java @@ -1,15 +1,5 @@ package org.keycloak.crypto.fips; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1Integer; -import org.bouncycastle.asn1.ASN1Primitive; -import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.asn1.DERSequenceGenerator; -import org.bouncycastle.asn1.x9.X9IntegerConverter; -import org.bouncycastle.jcajce.spec.ECDomainParameterSpec; -import org.bouncycastle.math.ec.ECPoint; -import org.keycloak.common.crypto.ECDSACryptoProvider; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.math.BigInteger; @@ -21,6 +11,17 @@ import java.security.spec.ECParameterSpec; import java.security.spec.ECPublicKeySpec; import java.security.spec.InvalidKeySpecException; +import org.keycloak.common.crypto.ECDSACryptoProvider; + +import org.bouncycastle.asn1.ASN1InputStream; +import org.bouncycastle.asn1.ASN1Integer; +import org.bouncycastle.asn1.ASN1Primitive; +import org.bouncycastle.asn1.ASN1Sequence; +import org.bouncycastle.asn1.DERSequenceGenerator; +import org.bouncycastle.asn1.x9.X9IntegerConverter; +import org.bouncycastle.jcajce.spec.ECDomainParameterSpec; +import org.bouncycastle.math.ec.ECPoint; + public class BCFIPSECDSACryptoProvider implements ECDSACryptoProvider { diff --git a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSEcdhEsAlgorithmProvider.java b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSEcdhEsAlgorithmProvider.java index 5506bd14141..ac69c5fc91d 100644 --- a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSEcdhEsAlgorithmProvider.java +++ b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSEcdhEsAlgorithmProvider.java @@ -38,6 +38,17 @@ import java.security.spec.ECPoint; import java.security.spec.ECPublicKeySpec; import java.security.spec.InvalidKeySpecException; +import org.keycloak.common.util.Base64Url; +import org.keycloak.crypto.Algorithm; +import org.keycloak.crypto.KeyType; +import org.keycloak.jose.jwe.JWEHeader; +import org.keycloak.jose.jwe.JWEHeader.JWEHeaderBuilder; +import org.keycloak.jose.jwe.JWEKeyStorage; +import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; +import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; +import org.keycloak.jose.jwk.ECPublicJWK; +import org.keycloak.jose.jwk.JWKUtil; + import org.bouncycastle.asn1.nist.NISTNamedCurves; import org.bouncycastle.asn1.x9.X9ECParameters; import org.bouncycastle.crypto.KeyUnwrapper; @@ -54,16 +65,6 @@ import org.bouncycastle.crypto.fips.FipsEC; import org.bouncycastle.crypto.fips.FipsKDF; import org.bouncycastle.crypto.fips.FipsKDF.AgreementKDFPRF; import org.bouncycastle.jcajce.spec.ECDomainParameterSpec; -import org.keycloak.common.util.Base64Url; -import org.keycloak.crypto.Algorithm; -import org.keycloak.crypto.KeyType; -import org.keycloak.jose.jwe.JWEHeader; -import org.keycloak.jose.jwe.JWEHeader.JWEHeaderBuilder; -import org.keycloak.jose.jwe.JWEKeyStorage; -import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; -import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; -import org.keycloak.jose.jwk.ECPublicJWK; -import org.keycloak.jose.jwk.JWKUtil; /** * ECDH Ephemeral Static Algorithm Provider. diff --git a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSOCSPProvider.java b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSOCSPProvider.java index 36ba06fb7ca..ec79fac9894 100644 --- a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSOCSPProvider.java +++ b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSOCSPProvider.java @@ -18,45 +18,6 @@ package org.keycloak.crypto.fips; -import org.bouncycastle.asn1.ASN1InputStream; -import org.bouncycastle.asn1.ASN1Sequence; -import org.bouncycastle.asn1.DERIA5String; -import org.bouncycastle.asn1.DEROctetString; -import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers; -import org.bouncycastle.asn1.x500.X500Name; -import org.bouncycastle.asn1.x509.Extension; -import org.bouncycastle.asn1.x509.Extensions; -import org.bouncycastle.asn1.x509.SubjectKeyIdentifier; -import org.bouncycastle.asn1.x509.KeyPurposeId; -import org.bouncycastle.asn1.x509.AuthorityInformationAccess; -import org.bouncycastle.asn1.x509.AccessDescription; -import org.bouncycastle.asn1.x509.GeneralName; -import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; -import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils; -import org.bouncycastle.cert.ocsp.BasicOCSPResp; -import org.bouncycastle.cert.ocsp.CertificateID; -import org.bouncycastle.cert.ocsp.CertificateStatus; -import org.bouncycastle.cert.ocsp.OCSPException; -import org.bouncycastle.cert.ocsp.OCSPReq; -import org.bouncycastle.cert.ocsp.OCSPReqBuilder; -import org.bouncycastle.cert.ocsp.OCSPResp; -import org.bouncycastle.cert.ocsp.RevokedStatus; -import org.bouncycastle.cert.ocsp.SingleResp; -import org.bouncycastle.cert.ocsp.UnknownStatus; -import org.bouncycastle.cert.ocsp.jcajce.JcaCertificateID; -import org.bouncycastle.operator.ContentVerifierProvider; -import org.bouncycastle.operator.DigestCalculator; -import org.bouncycastle.operator.DigestCalculatorProvider; -import org.bouncycastle.operator.OperatorCreationException; -import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder; -import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import org.keycloak.jose.jwe.JWEUtils; -import org.keycloak.common.util.BouncyIntegration; -import org.keycloak.models.KeycloakSession; -import org.keycloak.utils.OCSPProvider; - import java.io.IOException; import java.net.URI; import java.security.GeneralSecurityException; @@ -80,6 +41,46 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; +import org.keycloak.common.util.BouncyIntegration; +import org.keycloak.jose.jwe.JWEUtils; +import org.keycloak.models.KeycloakSession; +import org.keycloak.utils.OCSPProvider; + +import org.bouncycastle.asn1.ASN1InputStream; +import org.bouncycastle.asn1.ASN1Sequence; +import org.bouncycastle.asn1.DERIA5String; +import org.bouncycastle.asn1.DEROctetString; +import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers; +import org.bouncycastle.asn1.x500.X500Name; +import org.bouncycastle.asn1.x509.AccessDescription; +import org.bouncycastle.asn1.x509.AuthorityInformationAccess; +import org.bouncycastle.asn1.x509.Extension; +import org.bouncycastle.asn1.x509.Extensions; +import org.bouncycastle.asn1.x509.GeneralName; +import org.bouncycastle.asn1.x509.KeyPurposeId; +import org.bouncycastle.asn1.x509.SubjectKeyIdentifier; +import org.bouncycastle.cert.X509CertificateHolder; +import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter; +import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; +import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils; +import org.bouncycastle.cert.ocsp.BasicOCSPResp; +import org.bouncycastle.cert.ocsp.CertificateID; +import org.bouncycastle.cert.ocsp.CertificateStatus; +import org.bouncycastle.cert.ocsp.OCSPException; +import org.bouncycastle.cert.ocsp.OCSPReq; +import org.bouncycastle.cert.ocsp.OCSPReqBuilder; +import org.bouncycastle.cert.ocsp.OCSPResp; +import org.bouncycastle.cert.ocsp.RevokedStatus; +import org.bouncycastle.cert.ocsp.SingleResp; +import org.bouncycastle.cert.ocsp.UnknownStatus; +import org.bouncycastle.cert.ocsp.jcajce.JcaCertificateID; +import org.bouncycastle.operator.ContentVerifierProvider; +import org.bouncycastle.operator.DigestCalculator; +import org.bouncycastle.operator.DigestCalculatorProvider; +import org.bouncycastle.operator.OperatorCreationException; +import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder; +import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; + /** * @author Peter Nalyvayko diff --git a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSPemUtilsProvider.java b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSPemUtilsProvider.java index 40171a15205..0bb479e20a8 100755 --- a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSPemUtilsProvider.java +++ b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSPemUtilsProvider.java @@ -17,22 +17,23 @@ package org.keycloak.crypto.fips; +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.security.PrivateKey; +import java.security.PublicKey; + +import org.keycloak.common.crypto.PemUtilsProvider; +import org.keycloak.common.util.BouncyIntegration; +import org.keycloak.common.util.PemException; +import org.keycloak.common.util.PemUtils; + import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo; import org.bouncycastle.openssl.PEMKeyPair; import org.bouncycastle.openssl.PEMParser; import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter; import org.bouncycastle.openssl.jcajce.JcaPEMWriter; -import org.keycloak.common.util.BouncyIntegration; -import org.keycloak.common.util.PemException; -import org.keycloak.common.crypto.PemUtilsProvider; -import org.keycloak.common.util.PemUtils; - -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; -import java.security.PrivateKey; -import java.security.PublicKey; /** * Encodes Key or Certificates to PEM format string diff --git a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSUserIdentityExtractorProvider.java b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSUserIdentityExtractorProvider.java index c25677ce1c5..92825555f20 100644 --- a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSUserIdentityExtractorProvider.java +++ b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/BCFIPSUserIdentityExtractorProvider.java @@ -18,6 +18,20 @@ package org.keycloak.crypto.fips; +import java.io.ByteArrayInputStream; +import java.security.Principal; +import java.security.cert.CertificateParsingException; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Optional; +import java.util.function.Function; + +import org.keycloak.common.crypto.UserIdentityExtractor; +import org.keycloak.common.crypto.UserIdentityExtractorProvider; + import org.bouncycastle.asn1.ASN1Encodable; import org.bouncycastle.asn1.ASN1InputStream; import org.bouncycastle.asn1.ASN1ObjectIdentifier; @@ -30,19 +44,6 @@ import org.bouncycastle.asn1.x500.X500Name; import org.bouncycastle.asn1.x500.style.BCStyle; import org.bouncycastle.asn1.x500.style.IETFUtils; import org.jboss.logging.Logger; -import org.keycloak.common.crypto.UserIdentityExtractor; -import org.keycloak.common.crypto.UserIdentityExtractorProvider; - -import java.io.ByteArrayInputStream; -import java.security.Principal; -import java.security.cert.CertificateParsingException; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Optional; -import java.util.function.Function; /** * @author Peter Nalyvayko diff --git a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPS1402Provider.java b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPS1402Provider.java index e590cef8872..561724fbfd0 100644 --- a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPS1402Provider.java +++ b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPS1402Provider.java @@ -16,12 +16,6 @@ import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; import java.security.Provider; import java.security.SecureRandom; -import java.security.spec.ECField; -import java.security.spec.ECFieldF2m; -import java.security.spec.ECFieldFp; -import java.security.spec.ECParameterSpec; -import java.security.spec.ECPoint; -import java.security.spec.EllipticCurve; import java.security.Security; import java.security.Signature; import java.security.cert.CertPathBuilder; @@ -29,12 +23,17 @@ import java.security.cert.CertStore; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.CollectionCertStoreParameters; +import java.security.spec.ECField; +import java.security.spec.ECFieldF2m; +import java.security.spec.ECFieldFp; +import java.security.spec.ECParameterSpec; +import java.security.spec.ECPoint; +import java.security.spec.EllipticCurve; import java.util.Arrays; import java.util.Collections; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; - import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; import javax.crypto.SecretKeyFactory; @@ -45,6 +44,16 @@ import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManagerFactory; +import org.keycloak.common.crypto.CertificateUtilsProvider; +import org.keycloak.common.crypto.CryptoConstants; +import org.keycloak.common.crypto.CryptoProvider; +import org.keycloak.common.crypto.ECDSACryptoProvider; +import org.keycloak.common.crypto.PemUtilsProvider; +import org.keycloak.common.crypto.UserIdentityExtractorProvider; +import org.keycloak.common.util.BouncyIntegration; +import org.keycloak.common.util.KeystoreUtil.KeystoreFormat; +import org.keycloak.crypto.JavaAlgorithm; + import org.bouncycastle.asn1.x9.ECNamedCurveTable; import org.bouncycastle.asn1.x9.X9ECParameters; import org.bouncycastle.crypto.CryptoServicesRegistrar; @@ -56,15 +65,6 @@ import org.bouncycastle.jsse.util.CustomSSLSocketFactory; import org.bouncycastle.math.ec.ECCurve; import org.bouncycastle.util.IPAddress; import org.jboss.logging.Logger; -import org.keycloak.common.crypto.CryptoProvider; -import org.keycloak.common.crypto.ECDSACryptoProvider; -import org.keycloak.common.crypto.CryptoConstants; -import org.keycloak.common.crypto.CertificateUtilsProvider; -import org.keycloak.common.crypto.PemUtilsProvider; -import org.keycloak.common.crypto.UserIdentityExtractorProvider; -import org.keycloak.common.util.BouncyIntegration; -import org.keycloak.common.util.KeystoreUtil.KeystoreFormat; -import org.keycloak.crypto.JavaAlgorithm; /** diff --git a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPSAesKeyWrapAlgorithmProvider.java b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPSAesKeyWrapAlgorithmProvider.java index 59f527ca805..d1b0eb95aa7 100644 --- a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPSAesKeyWrapAlgorithmProvider.java +++ b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPSAesKeyWrapAlgorithmProvider.java @@ -2,16 +2,17 @@ package org.keycloak.crypto.fips; import java.security.Key; +import org.keycloak.jose.jwe.JWEHeader; +import org.keycloak.jose.jwe.JWEHeader.JWEHeaderBuilder; +import org.keycloak.jose.jwe.JWEKeyStorage; +import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; +import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; + import org.bouncycastle.crypto.KeyUnwrapper; import org.bouncycastle.crypto.KeyWrapper; import org.bouncycastle.crypto.SymmetricKey; import org.bouncycastle.crypto.SymmetricSecretKey; import org.bouncycastle.crypto.fips.FipsAES; -import org.keycloak.jose.jwe.JWEHeader; -import org.keycloak.jose.jwe.JWEKeyStorage; -import org.keycloak.jose.jwe.JWEHeader.JWEHeaderBuilder; -import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; -import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; /** * Variant of {@link org.keycloak.jose.jwe.alg.AesKeyWrapAlgorithmProvider} based on FIPS diff --git a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPSRsaKeyEncryptionJWEAlgorithmProvider.java b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPSRsaKeyEncryptionJWEAlgorithmProvider.java index 4fc6e7b25ef..8d7a4a9c551 100644 --- a/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPSRsaKeyEncryptionJWEAlgorithmProvider.java +++ b/crypto/fips1402/src/main/java/org/keycloak/crypto/fips/FIPSRsaKeyEncryptionJWEAlgorithmProvider.java @@ -3,16 +3,17 @@ package org.keycloak.crypto.fips; import java.security.Key; import java.security.SecureRandom; +import org.keycloak.jose.jwe.JWEHeader; +import org.keycloak.jose.jwe.JWEHeader.JWEHeaderBuilder; +import org.keycloak.jose.jwe.JWEKeyStorage; +import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; +import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; + import org.bouncycastle.crypto.KeyUnwrapperUsingSecureRandom; import org.bouncycastle.crypto.KeyWrapperUsingSecureRandom; import org.bouncycastle.crypto.asymmetric.AsymmetricRSAPrivateKey; import org.bouncycastle.crypto.asymmetric.AsymmetricRSAPublicKey; import org.bouncycastle.crypto.fips.FipsRSA; -import org.keycloak.jose.jwe.JWEHeader; -import org.keycloak.jose.jwe.JWEKeyStorage; -import org.keycloak.jose.jwe.JWEHeader.JWEHeaderBuilder; -import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; -import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; /** * Fips note: Based on https://downloads.bouncycastle.org/fips-java/BC-FJA-UserGuide-1.0.2.pdf, Section 4 diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/BCFIPSECDSACryptoProviderTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/BCFIPSECDSACryptoProviderTest.java index d3e41dd9a49..2304b35f7cd 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/BCFIPSECDSACryptoProviderTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/BCFIPSECDSACryptoProviderTest.java @@ -16,18 +16,6 @@ */ package org.keycloak.crypto.fips.test; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.crypto.Algorithm; -import org.keycloak.crypto.fips.BCFIPSECDSACryptoProvider; -import org.keycloak.keys.AbstractEcKeyProviderFactory; -import org.keycloak.keys.GeneratedEcdhKeyProviderFactory; -import org.keycloak.keys.GeneratedEcdsaKeyProviderFactory; -import org.keycloak.rule.CryptoInitRule; - import java.security.InvalidAlgorithmParameterException; import java.security.KeyPair; import java.security.KeyPairGenerator; @@ -39,6 +27,19 @@ import java.security.spec.ECGenParameterSpec; import java.util.Arrays; import java.util.Collection; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.crypto.Algorithm; +import org.keycloak.crypto.fips.BCFIPSECDSACryptoProvider; +import org.keycloak.keys.AbstractEcKeyProviderFactory; +import org.keycloak.keys.GeneratedEcdhKeyProviderFactory; +import org.keycloak.keys.GeneratedEcdsaKeyProviderFactory; +import org.keycloak.rule.CryptoInitRule; + +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + import static org.junit.Assert.assertEquals; @RunWith(Parameterized.class) diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/BCFIPSEcdhEsAlgorithmProviderTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/BCFIPSEcdhEsAlgorithmProviderTest.java index 6124220908a..f69b2bfcb84 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/BCFIPSEcdhEsAlgorithmProviderTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/BCFIPSEcdhEsAlgorithmProviderTest.java @@ -30,13 +30,6 @@ import java.security.spec.ECPrivateKeySpec; import java.security.spec.ECPublicKeySpec; import java.security.spec.InvalidKeySpecException; -import org.bouncycastle.asn1.nist.NISTNamedCurves; -import org.bouncycastle.asn1.x9.X9ECParameters; -import org.bouncycastle.crypto.asymmetric.ECDomainParameters; -import org.bouncycastle.jcajce.spec.ECDomainParameterSpec; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; import org.keycloak.common.util.Base64Url; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.fips.BCFIPSEcdhEsAlgorithmProvider; @@ -46,6 +39,14 @@ import org.keycloak.jose.jwe.JWEException; import org.keycloak.jose.jwe.JWEHeader; import org.keycloak.rule.CryptoInitRule; +import org.bouncycastle.asn1.nist.NISTNamedCurves; +import org.bouncycastle.asn1.x9.X9ECParameters; +import org.bouncycastle.crypto.asymmetric.ECDomainParameters; +import org.bouncycastle.jcajce.spec.ECDomainParameterSpec; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Test; + public class BCFIPSEcdhEsAlgorithmProviderTest { @ClassRule public static CryptoInitRule cryptoInitRule = new CryptoInitRule(); diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402CertificateIdentityExtractorTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402CertificateIdentityExtractorTest.java index bc1c12eb20c..535decf1ad7 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402CertificateIdentityExtractorTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402CertificateIdentityExtractorTest.java @@ -19,11 +19,12 @@ package org.keycloak.crypto.fips.test; -import org.junit.Assume; -import org.junit.Before; import org.keycloak.authentication.x509.CertificateIdentityExtractorTest; import org.keycloak.common.util.Environment; +import org.junit.Assume; +import org.junit.Before; + /** * @author Marek Posolda */ diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402HmacTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402HmacTest.java index 13927093230..2fe2e0e14fe 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402HmacTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402HmacTest.java @@ -2,18 +2,18 @@ package org.keycloak.crypto.fips.test; import java.util.UUID; - import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; import javax.crypto.spec.SecretKeySpec; +import org.keycloak.common.util.BouncyIntegration; +import org.keycloak.common.util.Environment; +import org.keycloak.jose.HmacTest; + import org.bouncycastle.crypto.CryptoServicesRegistrar; import org.junit.Assume; import org.junit.Before; import org.junit.Test; -import org.keycloak.common.util.BouncyIntegration; -import org.keycloak.common.util.Environment; -import org.keycloak.jose.HmacTest; /** diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402JWETest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402JWETest.java index dbc86b49690..3e49cc36706 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402JWETest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402JWETest.java @@ -1,10 +1,11 @@ package org.keycloak.crypto.fips.test; +import org.keycloak.common.util.Environment; +import org.keycloak.jose.JWETest; + import org.junit.Assume; import org.junit.Before; import org.junit.Test; -import org.keycloak.common.util.Environment; -import org.keycloak.jose.JWETest; /** * Test with fips1402 security provider and bouncycastle-fips diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402JWKTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402JWKTest.java index 425f577bb8a..d31a5317016 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402JWKTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402JWKTest.java @@ -1,11 +1,12 @@ package org.keycloak.crypto.fips.test; +import org.keycloak.common.util.Environment; +import org.keycloak.jose.jwk.JWKTest; + import org.junit.Assume; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.keycloak.common.util.Environment; -import org.keycloak.jose.jwk.JWKTest; /** * Test with fips1402 security provider and bouncycastle-fips diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402KeyPairVerifierTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402KeyPairVerifierTest.java index bd64a9374de..8ef8f310818 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402KeyPairVerifierTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402KeyPairVerifierTest.java @@ -1,13 +1,14 @@ package org.keycloak.crypto.fips.test; +import org.keycloak.KeyPairVerifierTest; +import org.keycloak.common.util.Environment; + import org.bouncycastle.crypto.CryptoServicesRegistrar; import org.bouncycastle.crypto.fips.FipsUnapprovedOperationError; import org.junit.Assert; -import org.junit.Before; import org.junit.Assume; +import org.junit.Before; import org.junit.Test; -import org.keycloak.KeyPairVerifierTest; -import org.keycloak.common.util.Environment; /** * Test with fips1402 security provider and bouncycastle-fips diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402KeystoreTypesTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402KeystoreTypesTest.java index 30f9feb9efa..bf4e748f291 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402KeystoreTypesTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402KeystoreTypesTest.java @@ -3,16 +3,17 @@ package org.keycloak.crypto.fips.test; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.Environment; +import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.rule.CryptoInitRule; + import org.bouncycastle.crypto.CryptoServicesRegistrar; import org.hamcrest.Matchers; import org.junit.Assume; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.Environment; -import org.keycloak.common.util.KeystoreUtil; -import org.keycloak.rule.CryptoInitRule; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402Pbkdf2PasswordPaddingTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402Pbkdf2PasswordPaddingTest.java index f1892de8df6..ed66d3dbd65 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402Pbkdf2PasswordPaddingTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402Pbkdf2PasswordPaddingTest.java @@ -1,5 +1,15 @@ package org.keycloak.crypto.fips.test; +import org.keycloak.Config; +import org.keycloak.common.util.Environment; +import org.keycloak.credential.hash.AbstractPbkdf2PasswordHashProviderFactory; +import org.keycloak.credential.hash.PasswordHashProvider; +import org.keycloak.credential.hash.PasswordHashSpi; +import org.keycloak.credential.hash.Pbkdf2Sha256PasswordHashProviderFactory; +import org.keycloak.models.credential.PasswordCredentialModel; +import org.keycloak.rule.CryptoInitRule; +import org.keycloak.rule.RunInThreadRule; + import org.bouncycastle.crypto.CryptoServicesRegistrar; import org.bouncycastle.crypto.fips.FipsUnapprovedOperationError; import org.jboss.logging.Logger; @@ -10,15 +20,6 @@ import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; -import org.keycloak.Config; -import org.keycloak.common.util.Environment; -import org.keycloak.credential.hash.AbstractPbkdf2PasswordHashProviderFactory; -import org.keycloak.credential.hash.PasswordHashProvider; -import org.keycloak.credential.hash.PasswordHashSpi; -import org.keycloak.credential.hash.Pbkdf2Sha256PasswordHashProviderFactory; -import org.keycloak.models.credential.PasswordCredentialModel; -import org.keycloak.rule.CryptoInitRule; -import org.keycloak.rule.RunInThreadRule; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402SecureRandomTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402SecureRandomTest.java index 509cc2e7650..3dde87518ae 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402SecureRandomTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402SecureRandomTest.java @@ -2,6 +2,10 @@ package org.keycloak.crypto.fips.test; import java.security.SecureRandom; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.Environment; +import org.keycloak.rule.CryptoInitRule; + import org.bouncycastle.crypto.CryptoServicesRegistrar; import org.bouncycastle.crypto.fips.FipsStatus; import org.jboss.logging.Logger; @@ -10,9 +14,6 @@ import org.junit.Assume; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.Environment; -import org.keycloak.rule.CryptoInitRule; /** * @author Marek Posolda diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402SslTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402SslTest.java index e56032fffda..f83977288fb 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402SslTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402SslTest.java @@ -4,13 +4,16 @@ import java.io.InputStream; import java.security.KeyStore; import java.util.Arrays; import java.util.List; - import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLSessionContext; import javax.net.ssl.TrustManagerFactory; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.Environment; +import org.keycloak.rule.CryptoInitRule; + import org.bouncycastle.crypto.CryptoServicesRegistrar; import org.jboss.logging.Logger; import org.junit.Assert; @@ -20,12 +23,9 @@ import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Ignore; import org.junit.Test; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.Environment; -import org.keycloak.rule.CryptoInitRule; -import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; /** * @author Marek Posolda diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402UnitTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402UnitTest.java index 611883a0c2a..dba96ace869 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402UnitTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/FIPS1402UnitTest.java @@ -1,13 +1,14 @@ package org.keycloak.crypto.fips.test; +import org.keycloak.common.crypto.CryptoConstants; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.crypto.fips.FIPSAesKeyWrapAlgorithmProvider; +import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; +import org.keycloak.rule.CryptoInitRule; + import org.junit.Assert; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.common.crypto.CryptoConstants; -import org.keycloak.crypto.fips.FIPSAesKeyWrapAlgorithmProvider; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; -import org.keycloak.rule.CryptoInitRule; /** * @author Marek Posolda diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/PemUtilsBCFIPSTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/PemUtilsBCFIPSTest.java index b5977171a3c..0a6d5e0aab1 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/PemUtilsBCFIPSTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/PemUtilsBCFIPSTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.fips.test; +import org.keycloak.common.util.Environment; +import org.keycloak.util.PemUtilsTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.util.PemUtilsTest; public class PemUtilsBCFIPSTest extends PemUtilsTest { @@ -13,4 +14,3 @@ public class PemUtilsBCFIPSTest extends PemUtilsTest { Assume.assumeTrue("Java is not in FIPS mode. Skipping the test.", Environment.isJavaInFipsMode()); } } - diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402JwtVcMetadataTrustedSdJwtIssuerTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402JwtVcMetadataTrustedSdJwtIssuerTest.java index 193818df8ab..8a7ed10bd8f 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402JwtVcMetadataTrustedSdJwtIssuerTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402JwtVcMetadataTrustedSdJwtIssuerTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.fips.test.sdjwt; +import org.keycloak.common.util.Environment; +import org.keycloak.sdjwt.consumer.JwtVcMetadataTrustedSdJwtIssuerTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.sdjwt.consumer.JwtVcMetadataTrustedSdJwtIssuerTest; public class FIPS1402JwtVcMetadataTrustedSdJwtIssuerTest extends JwtVcMetadataTrustedSdJwtIssuerTest { diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwsTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwsTest.java index 5ea68b1e138..e4f796833a9 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwsTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwsTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.fips.test.sdjwt; +import org.keycloak.common.util.Environment; +import org.keycloak.sdjwt.SdJwsTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.sdjwt.SdJwsTest; public class FIPS1402SdJwsTest extends SdJwsTest { diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtFacadeTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtFacadeTest.java index d57221c9ab6..7f9f94ada25 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtFacadeTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtFacadeTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.fips.test.sdjwt; +import org.keycloak.common.util.Environment; +import org.keycloak.sdjwt.SdJwtFacadeTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.sdjwt.SdJwtFacadeTest; public class FIPS1402SdJwtFacadeTest extends SdJwtFacadeTest { diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtPresentationConsumerTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtPresentationConsumerTest.java index 220537c035c..c7506490c5d 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtPresentationConsumerTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtPresentationConsumerTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.fips.test.sdjwt; +import org.keycloak.common.util.Environment; +import org.keycloak.sdjwt.consumer.SdJwtPresentationConsumerTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.sdjwt.consumer.SdJwtPresentationConsumerTest; public class FIPS1402SdJwtPresentationConsumerTest extends SdJwtPresentationConsumerTest { diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVPTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVPTest.java index 5dbffc325bd..736ab300a28 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVPTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVPTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.fips.test.sdjwt; +import org.keycloak.common.util.Environment; +import org.keycloak.sdjwt.sdjwtvp.SdJwtVPTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.sdjwt.sdjwtvp.SdJwtVPTest; public class FIPS1402SdJwtVPTest extends SdJwtVPTest { diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVPVerificationTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVPVerificationTest.java index f06def23908..83c8cecf1d8 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVPVerificationTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVPVerificationTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.fips.test.sdjwt; +import org.keycloak.common.util.Environment; +import org.keycloak.sdjwt.sdjwtvp.SdJwtVPVerificationTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.sdjwt.sdjwtvp.SdJwtVPVerificationTest; public class FIPS1402SdJwtVPVerificationTest extends SdJwtVPVerificationTest { diff --git a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVerificationTest.java b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVerificationTest.java index 1d1d7e0a27d..8e0c273136e 100644 --- a/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVerificationTest.java +++ b/crypto/fips1402/src/test/java/org/keycloak/crypto/fips/test/sdjwt/FIPS1402SdJwtVerificationTest.java @@ -1,9 +1,10 @@ package org.keycloak.crypto.fips.test.sdjwt; +import org.keycloak.common.util.Environment; +import org.keycloak.sdjwt.SdJwtVerificationTest; + import org.junit.Assume; import org.junit.Before; -import org.keycloak.common.util.Environment; -import org.keycloak.sdjwt.SdJwtVerificationTest; public class FIPS1402SdJwtVerificationTest extends SdJwtVerificationTest { diff --git a/docs/guides/src/test/java/org/keycloak/guides/DocsBuildDebugUtil.java b/docs/guides/src/test/java/org/keycloak/guides/DocsBuildDebugUtil.java index 80ab75d06aa..4cd22a4865f 100644 --- a/docs/guides/src/test/java/org/keycloak/guides/DocsBuildDebugUtil.java +++ b/docs/guides/src/test/java/org/keycloak/guides/DocsBuildDebugUtil.java @@ -6,7 +6,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Properties; - import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -14,14 +13,14 @@ import javax.xml.parsers.ParserConfigurationException; import org.keycloak.guides.maven.GuideBuilder; import org.keycloak.guides.maven.GuideMojo; + +import freemarker.template.TemplateException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; -import freemarker.template.TemplateException; - public class DocsBuildDebugUtil { public static void main(String[] args) throws IOException, TemplateException, ParserConfigurationException, SAXException { diff --git a/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Features.java b/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Features.java index 160d3addc98..51309aa1801 100644 --- a/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Features.java +++ b/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Features.java @@ -1,12 +1,12 @@ package org.keycloak.guides.maven; -import org.keycloak.common.Profile; - import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; +import org.keycloak.common.Profile; + public class Features { private final List features; diff --git a/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/GuideBuilder.java b/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/GuideBuilder.java index 2bd8771be81..27f331cf6d8 100644 --- a/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/GuideBuilder.java +++ b/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/GuideBuilder.java @@ -9,10 +9,10 @@ import java.util.Map; import java.util.Properties; import java.util.stream.Stream; -import org.apache.maven.plugin.logging.Log; import org.keycloak.common.Version; import freemarker.template.TemplateException; +import org.apache.maven.plugin.logging.Log; public class GuideBuilder { diff --git a/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Options.java b/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Options.java index 12cc875afb8..297edd9aaa9 100644 --- a/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Options.java +++ b/docs/maven-plugin/src/main/java/org/keycloak/guides/maven/Options.java @@ -1,20 +1,5 @@ package org.keycloak.guides.maven; -import static org.keycloak.quarkus.runtime.configuration.Configuration.OPTION_PART_SEPARATOR; -import static org.keycloak.quarkus.runtime.configuration.Configuration.toDashCase; -import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; - -import org.keycloak.config.ConfigSupportLevel; -import org.keycloak.config.DeprecatedMetadata; -import org.keycloak.config.OptionCategory; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.provider.ProviderFactory; -import org.keycloak.provider.ProviderManager; -import org.keycloak.provider.Spi; -import org.keycloak.quarkus.runtime.Providers; -import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; -import org.keycloak.utils.StringUtil; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -31,6 +16,21 @@ import java.util.TreeSet; import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import org.keycloak.config.ConfigSupportLevel; +import org.keycloak.config.DeprecatedMetadata; +import org.keycloak.config.OptionCategory; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.provider.ProviderFactory; +import org.keycloak.provider.ProviderManager; +import org.keycloak.provider.Spi; +import org.keycloak.quarkus.runtime.Providers; +import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; +import org.keycloak.utils.StringUtil; + +import static org.keycloak.quarkus.runtime.configuration.Configuration.OPTION_PART_SEPARATOR; +import static org.keycloak.quarkus.runtime.configuration.Configuration.toDashCase; +import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; + public class Options { private final Map> options; diff --git a/docs/maven-plugin/src/test/java/org/keycloak/guides/maven/DirectoryCopyVisitorTest.java b/docs/maven-plugin/src/test/java/org/keycloak/guides/maven/DirectoryCopyVisitorTest.java index e3025d40c59..2e31f322ec9 100644 --- a/docs/maven-plugin/src/test/java/org/keycloak/guides/maven/DirectoryCopyVisitorTest.java +++ b/docs/maven-plugin/src/test/java/org/keycloak/guides/maven/DirectoryCopyVisitorTest.java @@ -1,7 +1,5 @@ package org.keycloak.guides.maven; -import static org.junit.jupiter.api.Assertions.assertEquals; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -11,6 +9,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +import static org.junit.jupiter.api.Assertions.assertEquals; + class DirectoryCopyVisitorTest { @TempDir diff --git a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/Ipatuura.java b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/Ipatuura.java index 59a275a7c84..682c489a0c4 100644 --- a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/Ipatuura.java +++ b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/Ipatuura.java @@ -17,9 +17,6 @@ package org.keycloak.ipatuura_user_spi; -import com.fasterxml.jackson.databind.JsonNode; -import org.jboss.logging.Logger; - import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -28,12 +25,14 @@ import org.keycloak.component.ComponentModel; import org.keycloak.http.simple.SimpleHttp; import org.keycloak.http.simple.SimpleHttpRequest; import org.keycloak.http.simple.SimpleHttpResponse; -import org.keycloak.models.KeycloakSession; - import org.keycloak.ipatuura_user_spi.schemas.SCIMSearchRequest; import org.keycloak.ipatuura_user_spi.schemas.SCIMUser; +import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; +import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; + public class Ipatuura { private static final Logger logger = Logger.getLogger(Ipatuura.class); diff --git a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserModelDelegate.java b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserModelDelegate.java index b3e832e3b37..b41785ea32a 100644 --- a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserModelDelegate.java +++ b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserModelDelegate.java @@ -17,15 +17,16 @@ package org.keycloak.ipatuura_user_spi; -import org.apache.http.HttpStatus; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.http.simple.SimpleHttpResponse; import org.keycloak.models.UserModel; import org.keycloak.models.utils.UserModelDelegate; -import java.io.IOException; -import java.util.List; +import org.apache.http.HttpStatus; +import org.jboss.logging.Logger; public class IpatuuraUserModelDelegate extends UserModelDelegate { diff --git a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserStorageProvider.java b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserStorageProvider.java index 8a9c5b23325..d4fcb9c0cc6 100755 --- a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserStorageProvider.java +++ b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserStorageProvider.java @@ -17,34 +17,6 @@ package org.keycloak.ipatuura_user_spi; -import org.jboss.logging.Logger; - -import org.keycloak.component.ComponentModel; -import org.keycloak.credential.CredentialAuthentication; -import org.keycloak.credential.CredentialInput; -import org.keycloak.credential.CredentialInputValidator; -import org.keycloak.credential.UserCredentialManager; -import org.keycloak.http.simple.SimpleHttpResponse; -import org.keycloak.models.CredentialValidationOutput; -import org.keycloak.models.GroupModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.models.UserCredentialModel; -import org.keycloak.models.UserModel; -import org.keycloak.models.credential.PasswordCredentialModel; -import org.keycloak.storage.StorageId; -import org.keycloak.storage.UserStorageProvider; -import org.keycloak.storage.UserStoragePrivateUtil; -import org.keycloak.storage.user.ImportedUserValidation; -import org.keycloak.storage.user.UserLookupProvider; -import org.keycloak.storage.user.UserRegistrationProvider; - -import org.keycloak.ipatuura_user_spi.authenticator.IpatuuraAuthenticator; -import org.keycloak.ipatuura_user_spi.schemas.SCIMError; -import org.keycloak.ipatuura_user_spi.schemas.SCIMUser; - -import org.keycloak.storage.user.UserQueryProvider; - import java.io.IOException; import java.util.HashMap; import java.util.HashSet; @@ -54,7 +26,32 @@ import java.util.Map; import java.util.Set; import java.util.stream.Stream; +import org.keycloak.component.ComponentModel; +import org.keycloak.credential.CredentialAuthentication; +import org.keycloak.credential.CredentialInput; +import org.keycloak.credential.CredentialInputValidator; +import org.keycloak.credential.UserCredentialManager; +import org.keycloak.http.simple.SimpleHttpResponse; +import org.keycloak.ipatuura_user_spi.authenticator.IpatuuraAuthenticator; +import org.keycloak.ipatuura_user_spi.schemas.SCIMError; +import org.keycloak.ipatuura_user_spi.schemas.SCIMUser; +import org.keycloak.models.CredentialValidationOutput; +import org.keycloak.models.GroupModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.models.UserCredentialModel; +import org.keycloak.models.UserModel; +import org.keycloak.models.credential.PasswordCredentialModel; +import org.keycloak.storage.StorageId; +import org.keycloak.storage.UserStoragePrivateUtil; +import org.keycloak.storage.UserStorageProvider; +import org.keycloak.storage.user.ImportedUserValidation; +import org.keycloak.storage.user.UserLookupProvider; +import org.keycloak.storage.user.UserQueryProvider; +import org.keycloak.storage.user.UserRegistrationProvider; + import org.apache.http.HttpStatus; +import org.jboss.logging.Logger; /** * @author Justin Stephenson diff --git a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserStorageProviderFactory.java b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserStorageProviderFactory.java index 705f3153b65..953519c6ae3 100755 --- a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserStorageProviderFactory.java +++ b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/IpatuuraUserStorageProviderFactory.java @@ -17,22 +17,23 @@ package org.keycloak.ipatuura_user_spi; -import org.jboss.logging.Logger; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.component.ComponentModel; +import org.keycloak.component.ComponentValidationException; import org.keycloak.http.simple.SimpleHttpResponse; +import org.keycloak.ipatuura_user_spi.authenticator.IpatuuraAuthenticator; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import org.keycloak.component.ComponentValidationException; import org.keycloak.provider.EnvironmentDependentProviderFactory; -import org.keycloak.storage.UserStorageProviderFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import org.keycloak.ipatuura_user_spi.authenticator.IpatuuraAuthenticator; +import org.keycloak.storage.UserStorageProviderFactory; -import java.util.LinkedList; -import java.util.List; +import org.jboss.logging.Logger; /** * @author Justin Stephenson diff --git a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/authenticator/IpatuuraAuthenticator.java b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/authenticator/IpatuuraAuthenticator.java index 1ca6a15c14d..ec9661b07f6 100755 --- a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/authenticator/IpatuuraAuthenticator.java +++ b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/authenticator/IpatuuraAuthenticator.java @@ -19,10 +19,11 @@ package org.keycloak.ipatuura_user_spi.authenticator; import jakarta.ws.rs.core.HttpHeaders; -import org.jboss.logging.Logger; import org.keycloak.common.constants.KerberosConstants; import org.keycloak.models.KeycloakSession; +import org.jboss.logging.Logger; + /** * @author Justin Stephenson * @version $Revision: 1 $ diff --git a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/schemas/SCIMSearchRequest.java b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/schemas/SCIMSearchRequest.java index 52da04559fc..cbb1d827be6 100644 --- a/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/schemas/SCIMSearchRequest.java +++ b/federation/ipatuura/src/main/java/org/keycloak/ipatuura_user_spi/schemas/SCIMSearchRequest.java @@ -20,7 +20,6 @@ package org.keycloak.ipatuura_user_spi.schemas; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.annotation.Generated; import com.fasterxml.jackson.annotation.JsonAnyGetter; 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 8fb8f0777e9..ce4903bc8ca 100755 --- a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProvider.java +++ b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProvider.java @@ -17,7 +17,13 @@ package org.keycloak.federation.kerberos; -import org.jboss.logging.Logger; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; +import javax.security.auth.login.LoginException; + import org.keycloak.common.Profile; import org.keycloak.common.constants.KerberosConstants; import org.keycloak.credential.CredentialAuthentication; @@ -34,8 +40,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RequiredActionProviderModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserCredentialModel; -import org.keycloak.models.UserModel; import org.keycloak.models.UserManager; +import org.keycloak.models.UserModel; import org.keycloak.models.UserModel.RequiredAction; import org.keycloak.models.credential.PasswordCredentialModel; import org.keycloak.storage.ReadOnlyException; @@ -51,13 +57,7 @@ import org.keycloak.userprofile.UserProfileDecorator; import org.keycloak.userprofile.UserProfileMetadata; import org.keycloak.userprofile.UserProfileUtil; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - -import javax.security.auth.login.LoginException; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProviderFactory.java b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProviderFactory.java index 54bd05328b5..55ee50b7200 100755 --- a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProviderFactory.java +++ b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/KerberosFederationProviderFactory.java @@ -17,11 +17,13 @@ package org.keycloak.federation.kerberos; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.common.constants.KerberosConstants; import org.keycloak.component.ComponentModel; +import org.keycloak.component.ComponentValidationException; import org.keycloak.federation.kerberos.impl.KerberosServerSubjectAuthenticator; import org.keycloak.federation.kerberos.impl.KerberosUsernamePasswordAuthenticator; import org.keycloak.federation.kerberos.impl.SPNEGOAuthenticator; @@ -38,9 +40,8 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderFactory; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.utils.CredentialHelper; -import org.keycloak.component.ComponentValidationException; -import java.util.List; +import org.jboss.logging.Logger; /** * Factory for standalone Kerberos federation provider. Standalone means that it's not backed by LDAP. For Kerberos backed by LDAP (like MS AD or ApacheDS environment) diff --git a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/KerberosServerSubjectAuthenticator.java b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/KerberosServerSubjectAuthenticator.java index 4d509360e2c..e90c1892519 100644 --- a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/KerberosServerSubjectAuthenticator.java +++ b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/KerberosServerSubjectAuthenticator.java @@ -17,10 +17,7 @@ package org.keycloak.federation.kerberos.impl; -import org.jboss.logging.Logger; -import org.keycloak.common.util.KerberosJdkProvider; -import org.keycloak.federation.kerberos.CommonKerberosConfig; - +import java.io.IOException; import javax.security.auth.Subject; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -28,7 +25,11 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.Configuration; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import java.io.IOException; + +import org.keycloak.common.util.KerberosJdkProvider; +import org.keycloak.federation.kerberos.CommonKerberosConfig; + +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/KerberosUsernamePasswordAuthenticator.java b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/KerberosUsernamePasswordAuthenticator.java index 18f051cde91..f303c40baea 100644 --- a/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/KerberosUsernamePasswordAuthenticator.java +++ b/federation/kerberos/src/main/java/org/keycloak/federation/kerberos/impl/KerberosUsernamePasswordAuthenticator.java @@ -17,12 +17,7 @@ package org.keycloak.federation.kerberos.impl; -import org.jboss.logging.Logger; -import org.keycloak.common.util.KerberosJdkProvider; -import org.keycloak.federation.kerberos.CommonKerberosConfig; -import org.keycloak.federation.kerberos.KerberosPrincipal; -import org.keycloak.models.ModelException; - +import java.io.IOException; import javax.security.auth.Subject; import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; @@ -32,7 +27,13 @@ import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.login.Configuration; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import java.io.IOException; + +import org.keycloak.common.util.KerberosJdkProvider; +import org.keycloak.federation.kerberos.CommonKerberosConfig; +import org.keycloak.federation.kerberos.KerberosPrincipal; +import org.keycloak.models.ModelException; + +import org.jboss.logging.Logger; /** * @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 64557640960..d57cbc539e7 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 @@ -17,23 +17,24 @@ package org.keycloak.federation.kerberos.impl; +import java.security.PrivilegedExceptionAction; +import java.util.Base64; +import java.util.Iterator; +import java.util.Set; +import javax.security.auth.Subject; +import javax.security.auth.kerberos.KerberosTicket; + +import org.keycloak.common.constants.KerberosConstants; +import org.keycloak.common.util.KerberosSerializationUtils; +import org.keycloak.federation.kerberos.CommonKerberosConfig; +import org.keycloak.federation.kerberos.KerberosPrincipal; + import org.ietf.jgss.GSSContext; import org.ietf.jgss.GSSCredential; import org.ietf.jgss.GSSException; import org.ietf.jgss.GSSManager; import org.ietf.jgss.Oid; import org.jboss.logging.Logger; -import org.keycloak.common.constants.KerberosConstants; -import org.keycloak.common.util.KerberosSerializationUtils; -import org.keycloak.federation.kerberos.CommonKerberosConfig; -import org.keycloak.federation.kerberos.KerberosPrincipal; - -import javax.security.auth.Subject; -import javax.security.auth.kerberos.KerberosTicket; -import java.security.PrivilegedExceptionAction; -import java.util.Base64; -import java.util.Iterator; -import java.util.Set; /** * @author Marek Posolda diff --git a/federation/kerberos/src/test/java/org/keycloak/federation/kerberos/KerberosFederationProviderFactoryTest.java b/federation/kerberos/src/test/java/org/keycloak/federation/kerberos/KerberosFederationProviderFactoryTest.java index cfc28c6eab8..dea358a567e 100644 --- a/federation/kerberos/src/test/java/org/keycloak/federation/kerberos/KerberosFederationProviderFactoryTest.java +++ b/federation/kerberos/src/test/java/org/keycloak/federation/kerberos/KerberosFederationProviderFactoryTest.java @@ -17,14 +17,15 @@ package org.keycloak.federation.kerberos; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.common.constants.KerberosConstants; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; +import org.junit.Assert; +import org.junit.Test; + /** * Tests for KerberosFederationProviderFactory validation functionality. */ diff --git a/federation/ldap/src/main/java/org/keycloak/services/managers/LDAPServerCapabilitiesManager.java b/federation/ldap/src/main/java/org/keycloak/services/managers/LDAPServerCapabilitiesManager.java index ce1fdd0c8f1..87381626196 100755 --- a/federation/ldap/src/main/java/org/keycloak/services/managers/LDAPServerCapabilitiesManager.java +++ b/federation/ldap/src/main/java/org/keycloak/services/managers/LDAPServerCapabilitiesManager.java @@ -22,22 +22,23 @@ import java.util.Objects; import java.util.Set; import javax.naming.ldap.LdapContext; -import org.jboss.logging.Logger; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.ComponentRepresentation; +import org.keycloak.representations.idm.LDAPCapabilityRepresentation; import org.keycloak.representations.idm.TestLdapConnectionRepresentation; import org.keycloak.services.ServicesLogger; import org.keycloak.storage.ldap.LDAPConfig; -import org.keycloak.representations.idm.LDAPCapabilityRepresentation; import org.keycloak.storage.ldap.idm.store.ldap.LDAPContextManager; import org.keycloak.storage.ldap.idm.store.ldap.LDAPIdentityStore; import org.keycloak.storage.ldap.mappers.membership.group.GroupTreeResolver; import org.keycloak.utils.StringUtil; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java index 9e6be154553..5a57d03d239 100644 --- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java +++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java @@ -16,7 +16,15 @@ */ package org.keycloak.services.resources.admin; -import org.jboss.resteasy.reactive.NoCache; +import java.util.Set; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.common.ClientConnection; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -26,13 +34,7 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.managers.LDAPServerCapabilitiesManager; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.util.Set; +import org.jboss.resteasy.reactive.NoCache; /** * @resource User Storage Provider diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java index ef521fed163..492a79538dd 100644 --- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java +++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java @@ -16,7 +16,12 @@ */ package org.keycloak.services.resources.admin; -import org.jboss.resteasy.reactive.NoCache; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; @@ -25,11 +30,7 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.managers.LDAPServerCapabilitiesManager; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.FormParam; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import org.jboss.resteasy.reactive.NoCache; /** * @resource User Storage Provider diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPConfig.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPConfig.java index cb237feb55e..05dd18a6f55 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPConfig.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPConfig.java @@ -17,18 +17,17 @@ package org.keycloak.storage.ldap; -import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; +import java.util.Collection; +import java.util.HashSet; +import java.util.Properties; +import java.util.Set; +import javax.naming.directory.SearchControls; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.LDAPConstants; import org.keycloak.storage.UserStorageProvider; -import javax.naming.directory.SearchControls; - -import java.util.Collection; -import java.util.HashSet; -import java.util.Properties; -import java.util.Set; +import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; /** * @author Marek Posolda diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPIdentityStoreRegistry.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPIdentityStoreRegistry.java index 8b200b32007..6bffe9a6b3e 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPIdentityStoreRegistry.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPIdentityStoreRegistry.java @@ -17,7 +17,9 @@ package org.keycloak.storage.ldap; -import org.jboss.logging.Logger; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; @@ -25,8 +27,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.storage.ldap.idm.store.ldap.LDAPIdentityStore; import org.keycloak.storage.ldap.mappers.LDAPConfigDecorator; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProvider.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProvider.java index bd66f8fc06a..a11ea432916 100755 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProvider.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProvider.java @@ -33,14 +33,12 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; - import javax.naming.AuthenticationException; import javax.naming.CommunicationException; import javax.naming.NameNotFoundException; import javax.naming.NamingException; import javax.naming.directory.SearchControls; -import org.jboss.logging.Logger; import org.keycloak.common.constants.KerberosConstants; import org.keycloak.component.ComponentModel; import org.keycloak.credential.CredentialAuthentication; @@ -66,15 +64,15 @@ import org.keycloak.models.UserManager; import org.keycloak.models.UserModel; import org.keycloak.models.UserProvider; import org.keycloak.models.cache.CachedUserModel; +import org.keycloak.models.cache.UserCache; import org.keycloak.models.credential.PasswordCredentialModel; import org.keycloak.models.utils.ReadOnlyUserModelDelegate; import org.keycloak.policy.PasswordPolicyManagerProvider; import org.keycloak.policy.PolicyError; -import org.keycloak.models.cache.UserCache; import org.keycloak.storage.DatastoreProvider; -import org.keycloak.storage.StoreManagers; import org.keycloak.storage.ReadOnlyException; import org.keycloak.storage.StorageId; +import org.keycloak.storage.StoreManagers; import org.keycloak.storage.UserStoragePrivateUtil; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderModel; @@ -102,10 +100,11 @@ import org.keycloak.userprofile.AttributeMetadata; import org.keycloak.userprofile.UserProfileDecorator; import org.keycloak.userprofile.UserProfileMetadata; import org.keycloak.userprofile.UserProfileUtil; - import org.keycloak.utils.StreamsUtil; import org.keycloak.utils.StringUtil; +import org.jboss.logging.Logger; + /** * @author Marek Posolda * @author Bill Burke diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java index a6dacb20d2d..33937aa16a9 100755 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPStorageProviderFactory.java @@ -17,7 +17,13 @@ package org.keycloak.storage.ldap; -import org.jboss.logging.Logger; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; +import java.util.stream.Collectors; + import org.keycloak.Config; import org.keycloak.common.constants.KerberosConstants; import org.keycloak.component.ComponentModel; @@ -66,12 +72,7 @@ import org.keycloak.storage.user.ImportSynchronization; import org.keycloak.storage.user.SynchronizationResult; import org.keycloak.utils.CredentialHelper; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.function.Function; -import java.util.stream.Collectors; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPUtils.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPUtils.java index 3bfb2ac3f8c..f6710d0dd44 100755 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPUtils.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/LDAPUtils.java @@ -32,10 +32,8 @@ import java.util.Set; import java.util.TimeZone; import java.util.function.Consumer; import java.util.stream.Collectors; - import javax.naming.directory.SearchControls; -import org.jboss.logging.Logger; import org.keycloak.common.constants.KerberosConstants; import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; @@ -56,6 +54,8 @@ import org.keycloak.storage.ldap.mappers.LDAPMappersComparator; import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; import org.keycloak.storage.ldap.mappers.membership.MembershipType; +import org.jboss.logging.Logger; + /** * Allow to directly call some operations against LDAPIdentityStore. * diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/ReadonlyLDAPUserModelDelegate.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/ReadonlyLDAPUserModelDelegate.java index da8b918fa2c..8f93f107c1f 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/ReadonlyLDAPUserModelDelegate.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/ReadonlyLDAPUserModelDelegate.java @@ -17,8 +17,6 @@ package org.keycloak.storage.ldap; -import static org.keycloak.storage.ldap.LDAPStorageProvider.INTERNAL_ATTRIBUTES; - import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -27,6 +25,8 @@ import org.keycloak.models.UserModel; import org.keycloak.models.utils.UserModelDelegate; import org.keycloak.storage.ReadOnlyException; +import static org.keycloak.storage.ldap.LDAPStorageProvider.INTERNAL_ATTRIBUTES; + /** * Will be good to get rid of this class and use ReadOnlyUserModelDelegate, but it can't be done now due the backwards compatibility. * See KEYCLOAK-15139 as an example diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/model/LDAPObject.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/model/LDAPObject.java index b6d0dd3786d..6fcbbd0b203 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/model/LDAPObject.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/model/LDAPObject.java @@ -17,8 +17,6 @@ package org.keycloak.storage.ldap.idm.model; -import org.jboss.logging.Logger; - import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -29,6 +27,8 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/InCondition.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/InCondition.java index a55b7b11c75..b1c22db99e3 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/InCondition.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/InCondition.java @@ -43,4 +43,3 @@ class InCondition extends NamedParameterCondition { filter.append("))"); } } - diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/LDAPQuery.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/LDAPQuery.java index 17bcb490799..9fbf5f61408 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/LDAPQuery.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/LDAPQuery.java @@ -17,15 +17,25 @@ package org.keycloak.storage.ldap.idm.query.internal; -import org.keycloak.storage.StorageUnavailableException; - +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import javax.naming.AuthenticationException; import javax.naming.CommunicationException; import javax.naming.NameNotFoundException; -import javax.naming.AuthenticationException; -import org.jboss.logging.Logger; +import javax.naming.NamingException; +import javax.naming.directory.SearchControls; +import javax.naming.ldap.LdapContext; +import javax.naming.ldap.LdapName; + import org.keycloak.component.ComponentModel; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.ModelException; +import org.keycloak.storage.StorageUnavailableException; import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPDn; import org.keycloak.storage.ldap.idm.model.LDAPObject; @@ -35,20 +45,10 @@ import org.keycloak.storage.ldap.idm.store.ldap.LDAPContextManager; import org.keycloak.storage.ldap.mappers.LDAPMappersComparator; import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; -import javax.naming.NamingException; -import javax.naming.directory.SearchControls; -import javax.naming.ldap.LdapContext; -import javax.naming.ldap.LdapName; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; +import org.jboss.logging.Logger; import static java.util.Collections.unmodifiableSet; + import static org.keycloak.common.util.Throwables.isCausedBy; /** diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/LDAPQueryConditionsBuilder.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/LDAPQueryConditionsBuilder.java index 212c0a02e5b..da5fd62b738 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/LDAPQueryConditionsBuilder.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/LDAPQueryConditionsBuilder.java @@ -18,6 +18,7 @@ package org.keycloak.storage.ldap.idm.query.internal; import java.util.Arrays; + import org.keycloak.models.ModelException; import org.keycloak.storage.ldap.idm.query.Condition; import org.keycloak.storage.ldap.idm.query.Sort; diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/NamedParameterCondition.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/NamedParameterCondition.java index 473cfc423f3..f254f379499 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/NamedParameterCondition.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/query/internal/NamedParameterCondition.java @@ -18,6 +18,7 @@ package org.keycloak.storage.ldap.idm.query.internal; import java.util.Date; + import org.keycloak.storage.ldap.idm.query.Condition; import org.keycloak.storage.ldap.idm.query.EscapeStrategy; import org.keycloak.storage.ldap.idm.store.ldap.LDAPUtil; diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/IdentityStore.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/IdentityStore.java index a1a73beb2af..5ed31f7d826 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/IdentityStore.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/IdentityStore.java @@ -21,10 +21,11 @@ import java.util.List; import java.util.Set; import javax.naming.AuthenticationException; import javax.naming.ldap.LdapName; + import org.keycloak.models.ModelException; +import org.keycloak.representations.idm.LDAPCapabilityRepresentation; import org.keycloak.storage.ldap.LDAPConfig; import org.keycloak.storage.ldap.idm.model.LDAPObject; -import org.keycloak.representations.idm.LDAPCapabilityRepresentation; import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; import org.keycloak.storage.ldap.mappers.LDAPOperationDecorator; diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPContextManager.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPContextManager.java index f409a9ec026..b927d1d2f71 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPContextManager.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPContextManager.java @@ -1,13 +1,11 @@ package org.keycloak.storage.ldap.idm.store.ldap; -import org.jboss.logging.Logger; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.LDAPConstants; -import org.keycloak.storage.ldap.LDAPConfig; -import org.keycloak.tracing.TracingProvider; -import org.keycloak.truststore.TruststoreProvider; -import org.keycloak.vault.VaultStringSecret; - +import java.io.IOException; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; import javax.naming.AuthenticationException; import javax.naming.Context; import javax.naming.NamingException; @@ -15,12 +13,15 @@ import javax.naming.ldap.LdapContext; import javax.naming.ldap.StartTlsRequest; import javax.naming.ldap.StartTlsResponse; import javax.net.ssl.SSLSocketFactory; -import java.io.IOException; -import java.util.HashMap; -import java.util.Hashtable; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; + +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.LDAPConstants; +import org.keycloak.storage.ldap.LDAPConfig; +import org.keycloak.tracing.TracingProvider; +import org.keycloak.truststore.TruststoreProvider; +import org.keycloak.vault.VaultStringSecret; + +import org.jboss.logging.Logger; import static javax.naming.Context.SECURITY_CREDENTIALS; diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPIdentityStore.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPIdentityStore.java index 2721118580d..bfc00817a3c 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPIdentityStore.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPIdentityStore.java @@ -17,35 +17,6 @@ package org.keycloak.storage.ldap.idm.store.ldap; -import javax.naming.NameAlreadyBoundException; -import org.jboss.logging.Logger; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.LDAPConstants; -import org.keycloak.models.ModelException; -import org.keycloak.storage.ldap.LDAPConfig; -import org.keycloak.representations.idm.LDAPCapabilityRepresentation.CapabilityType; -import org.keycloak.storage.ldap.idm.model.LDAPDn; -import org.keycloak.storage.ldap.idm.model.LDAPObject; -import org.keycloak.representations.idm.LDAPCapabilityRepresentation; -import org.keycloak.storage.ldap.idm.query.Condition; -import org.keycloak.storage.ldap.idm.query.internal.EqualCondition; -import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; -import org.keycloak.storage.ldap.idm.query.internal.LDAPQueryConditionsBuilder; -import org.keycloak.storage.ldap.idm.store.IdentityStore; -import org.keycloak.storage.ldap.mappers.LDAPOperationDecorator; - -import javax.naming.AuthenticationException; -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attribute; -import javax.naming.directory.Attributes; -import javax.naming.directory.BasicAttribute; -import javax.naming.directory.BasicAttributes; -import javax.naming.directory.DirContext; -import javax.naming.directory.ModificationItem; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - import java.util.ArrayList; import java.util.Base64; import java.util.Collection; @@ -59,13 +30,41 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; - +import javax.naming.AuthenticationException; +import javax.naming.NameAlreadyBoundException; import javax.naming.NameNotFoundException; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; import javax.naming.directory.AttributeInUseException; +import javax.naming.directory.Attributes; +import javax.naming.directory.BasicAttribute; +import javax.naming.directory.BasicAttributes; +import javax.naming.directory.DirContext; +import javax.naming.directory.ModificationItem; import javax.naming.directory.NoSuchAttributeException; import javax.naming.directory.SchemaViolationException; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapName; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.LDAPConstants; +import org.keycloak.models.ModelException; +import org.keycloak.representations.idm.LDAPCapabilityRepresentation; +import org.keycloak.representations.idm.LDAPCapabilityRepresentation.CapabilityType; +import org.keycloak.storage.ldap.LDAPConfig; +import org.keycloak.storage.ldap.idm.model.LDAPDn; +import org.keycloak.storage.ldap.idm.model.LDAPObject; +import org.keycloak.storage.ldap.idm.query.Condition; +import org.keycloak.storage.ldap.idm.query.internal.EqualCondition; +import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; +import org.keycloak.storage.ldap.idm.query.internal.LDAPQueryConditionsBuilder; +import org.keycloak.storage.ldap.idm.store.IdentityStore; +import org.keycloak.storage.ldap.mappers.LDAPOperationDecorator; + +import org.jboss.logging.Logger; + /** * An IdentityStore implementation backed by an LDAP directory * diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPOperationManager.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPOperationManager.java index 3736a6b56a4..af534cadfae 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPOperationManager.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPOperationManager.java @@ -17,21 +17,13 @@ package org.keycloak.storage.ldap.idm.store.ldap; -import org.jboss.logging.Logger; -import org.keycloak.common.util.Time; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.LDAPConstants; -import org.keycloak.models.ModelException; -import org.keycloak.storage.ldap.LDAPConfig; -import org.keycloak.storage.ldap.idm.model.LDAPDn; -import org.keycloak.storage.ldap.idm.query.Condition; -import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; -import org.keycloak.storage.ldap.idm.query.internal.LDAPQueryConditionsBuilder; -import org.keycloak.storage.ldap.idm.store.ldap.extended.PasswordModifyRequest; -import org.keycloak.storage.ldap.mappers.LDAPOperationDecorator; -import org.keycloak.tracing.TracingProvider; -import org.keycloak.truststore.TruststoreProvider; - +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.List; +import java.util.Set; import javax.naming.AuthenticationException; import javax.naming.Binding; import javax.naming.Context; @@ -53,13 +45,21 @@ import javax.naming.ldap.PagedResultsResponseControl; import javax.naming.ldap.StartTlsResponse; import javax.net.ssl.SSLSocketFactory; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Hashtable; -import java.util.List; -import java.util.Set; +import org.keycloak.common.util.Time; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.LDAPConstants; +import org.keycloak.models.ModelException; +import org.keycloak.storage.ldap.LDAPConfig; +import org.keycloak.storage.ldap.idm.model.LDAPDn; +import org.keycloak.storage.ldap.idm.query.Condition; +import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; +import org.keycloak.storage.ldap.idm.query.internal.LDAPQueryConditionsBuilder; +import org.keycloak.storage.ldap.idm.store.ldap.extended.PasswordModifyRequest; +import org.keycloak.storage.ldap.mappers.LDAPOperationDecorator; +import org.keycloak.tracing.TracingProvider; +import org.keycloak.truststore.TruststoreProvider; + +import org.jboss.logging.Logger; /** *

This class provides a set of operations to manage LDAP trees.

diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPUtil.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPUtil.java index 839fbce6e57..b2a9de4df2e 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPUtil.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/LDAPUtil.java @@ -18,14 +18,14 @@ package org.keycloak.storage.ldap.idm.store.ldap; import java.io.ByteArrayOutputStream; -import org.keycloak.models.LDAPConstants; -import org.keycloak.models.ModelException; -import org.keycloak.storage.ldap.LDAPConfig; - import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; +import org.keycloak.models.LDAPConstants; +import org.keycloak.models.ModelException; +import org.keycloak.storage.ldap.LDAPConfig; + /** *

Utility class for working with LDAP.

* diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/SessionBoundInitialLdapContext.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/SessionBoundInitialLdapContext.java index 61025f3c84b..97f011a80ae 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/SessionBoundInitialLdapContext.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/idm/store/ldap/SessionBoundInitialLdapContext.java @@ -17,12 +17,12 @@ package org.keycloak.storage.ldap.idm.store.ldap; -import org.keycloak.models.KeycloakSession; - +import java.util.Hashtable; import javax.naming.NamingException; import javax.naming.ldap.Control; import javax.naming.ldap.InitialLdapContext; -import java.util.Hashtable; + +import org.keycloak.models.KeycloakSession; /** * A {@link InitialLdapContext} that binds instances of this class with the {@link KeycloakSession} so that any resource diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/AbstractLDAPStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/AbstractLDAPStorageMapper.java index 9368e6b8320..48ad6ab3a45 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/AbstractLDAPStorageMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/AbstractLDAPStorageMapper.java @@ -17,20 +17,20 @@ package org.keycloak.storage.ldap.mappers; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import javax.naming.AuthenticationException; + import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; +import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.user.SynchronizationResult; - -import javax.naming.AuthenticationException; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import org.keycloak.models.RoleModel; import org.keycloak.utils.KeycloakSessionUtil; /** diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/AbstractLDAPStorageMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/AbstractLDAPStorageMapperFactory.java index 6132db574fd..e034ee7b2d5 100755 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/AbstractLDAPStorageMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/AbstractLDAPStorageMapperFactory.java @@ -17,6 +17,10 @@ package org.keycloak.storage.ldap.mappers; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; @@ -25,10 +29,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.storage.ldap.LDAPStorageProvider; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/CertificateLDAPStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/CertificateLDAPStorageMapper.java index 366a242d396..c53fce6cd13 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/CertificateLDAPStorageMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/CertificateLDAPStorageMapper.java @@ -36,4 +36,3 @@ public class CertificateLDAPStorageMapper extends UserAttributeLDAPStorageMapper return mapperModel.get(IS_DER_FORMATTED, false); } } - diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/FullNameLDAPStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/FullNameLDAPStorageMapper.java index e09c4254511..50e672c2838 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/FullNameLDAPStorageMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/FullNameLDAPStorageMapper.java @@ -17,6 +17,13 @@ package org.keycloak.storage.ldap.mappers; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; @@ -28,13 +35,6 @@ import org.keycloak.storage.ldap.idm.query.Condition; import org.keycloak.storage.ldap.idm.query.internal.EqualCondition; import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Stream; - /** * Mapper useful for the LDAP deployments when some attribute (usually CN) is mapped to full name of user * diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/FullNameLDAPStorageMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/FullNameLDAPStorageMapperFactory.java index 4b377842846..68f3a688d85 100755 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/FullNameLDAPStorageMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/FullNameLDAPStorageMapperFactory.java @@ -17,6 +17,8 @@ package org.keycloak.storage.ldap.mappers; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; import org.keycloak.models.KeycloakSession; @@ -28,8 +30,6 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.ldap.LDAPConfig; import org.keycloak.storage.ldap.LDAPStorageProvider; -import java.util.List; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedAttributeMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedAttributeMapper.java index fa29b56b112..6ecf7b8809f 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedAttributeMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedAttributeMapper.java @@ -21,7 +21,6 @@ import java.util.Arrays; import java.util.Map; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -32,6 +31,8 @@ import org.keycloak.storage.ldap.LDAPUtils; import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; +import org.jboss.logging.Logger; + public class HardcodedAttributeMapper extends AbstractLDAPStorageMapper { diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPAttributeMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPAttributeMapper.java index 220f779665d..737dcb490ab 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPAttributeMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPAttributeMapper.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -30,6 +29,8 @@ import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPGroupStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPGroupStorageMapper.java index 700dca09c6a..ca0a73343b7 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPGroupStorageMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPGroupStorageMapper.java @@ -17,7 +17,8 @@ package org.keycloak.storage.ldap.mappers; -import org.jboss.logging.Logger; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.ModelException; @@ -31,7 +32,7 @@ import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; -import java.util.stream.Stream; +import org.jboss.logging.Logger; /** * @author Jean-Loup Maillet diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPGroupStorageMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPGroupStorageMapperFactory.java index 33f39686e28..40c2bd50441 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPGroupStorageMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPGroupStorageMapperFactory.java @@ -17,6 +17,9 @@ package org.keycloak.storage.ldap.mappers; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; import org.keycloak.models.GroupModel; @@ -26,9 +29,6 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.storage.ldap.LDAPStorageProvider; -import java.util.ArrayList; -import java.util.List; - /** * @author Jean-Loup Maillet */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPRoleStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPRoleStorageMapper.java index 980d0797ac1..8101d325455 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPRoleStorageMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPRoleStorageMapper.java @@ -17,7 +17,8 @@ package org.keycloak.storage.ldap.mappers; -import org.jboss.logging.Logger; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.ModelException; @@ -30,7 +31,7 @@ import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; -import java.util.stream.Stream; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPRoleStorageMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPRoleStorageMapperFactory.java index 66cef5543ba..093eaac6615 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPRoleStorageMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/HardcodedLDAPRoleStorageMapperFactory.java @@ -17,6 +17,9 @@ package org.keycloak.storage.ldap.mappers; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; import org.keycloak.models.KeycloakSession; @@ -26,9 +29,6 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.storage.ldap.LDAPStorageProvider; -import java.util.ArrayList; -import java.util.List; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPMappersComparator.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPMappersComparator.java index fc9d1cbfbef..d61f4861ba6 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPMappersComparator.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPMappersComparator.java @@ -17,12 +17,12 @@ package org.keycloak.storage.ldap.mappers; +import java.util.Comparator; + import org.keycloak.component.ComponentModel; import org.keycloak.models.UserModel; import org.keycloak.storage.ldap.LDAPConfig; -import java.util.Comparator; - /** * TODO: Possibly add "priority" instead of hardcoding behaviour * diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPStorageMapper.java index ed56ae00a6e..8c0cdb657cc 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPStorageMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPStorageMapper.java @@ -17,20 +17,20 @@ package org.keycloak.storage.ldap.mappers; +import java.util.List; +import java.util.Set; +import javax.naming.AuthenticationException; + import org.keycloak.models.GroupModel; import org.keycloak.models.RealmModel; +import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.provider.Provider; +import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; import org.keycloak.storage.user.SynchronizationResult; -import javax.naming.AuthenticationException; -import java.util.List; -import java.util.Set; -import org.keycloak.models.RoleModel; -import org.keycloak.storage.ldap.LDAPStorageProvider; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPStorageMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPStorageMapperFactory.java index 807337a3927..bcde93a331d 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPStorageMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPStorageMapperFactory.java @@ -16,6 +16,9 @@ */ package org.keycloak.storage.ldap.mappers; +import java.util.Collections; +import java.util.List; + import org.keycloak.Config; import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; @@ -26,9 +29,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.storage.UserStorageProviderModel; -import java.util.Collections; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPTransaction.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPTransaction.java index 943a1c04ebf..e5f11058739 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPTransaction.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/LDAPTransaction.java @@ -20,12 +20,13 @@ package org.keycloak.storage.ldap.mappers; import java.util.HashSet; import java.util.Set; -import org.jboss.logging.Logger; import org.keycloak.models.AbstractKeycloakTransaction; import org.keycloak.models.ModelValidationException; import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ @@ -105,4 +106,3 @@ public class LDAPTransaction extends AbstractKeycloakTransaction { } } - diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/TxAwareLDAPUserModelDelegate.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/TxAwareLDAPUserModelDelegate.java index 028f90e6568..3d72965556e 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/TxAwareLDAPUserModelDelegate.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/TxAwareLDAPUserModelDelegate.java @@ -17,12 +17,13 @@ package org.keycloak.storage.ldap.mappers; -import org.jboss.logging.Logger; import org.keycloak.models.UserModel; import org.keycloak.models.utils.UserModelDelegate; import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.idm.model.LDAPObject; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/UserAttributeLDAPStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/UserAttributeLDAPStorageMapper.java index 1161d7d8c21..d43c7eba942 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/UserAttributeLDAPStorageMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/UserAttributeLDAPStorageMapper.java @@ -17,9 +17,17 @@ package org.keycloak.storage.ldap.mappers; -import static java.util.Optional.ofNullable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; @@ -40,16 +48,9 @@ import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.ldap.idm.query.Condition; import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; + +import static java.util.Optional.ofNullable; /** * @author Marek Posolda diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/UserAttributeLDAPStorageMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/UserAttributeLDAPStorageMapperFactory.java index 533d574484b..d5036703f11 100755 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/UserAttributeLDAPStorageMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/UserAttributeLDAPStorageMapperFactory.java @@ -17,6 +17,8 @@ package org.keycloak.storage.ldap.mappers; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; import org.keycloak.models.KeycloakSession; @@ -28,8 +30,6 @@ import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.ldap.LDAPConfig; import org.keycloak.storage.ldap.LDAPStorageProvider; -import java.util.List; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/CommonLDAPGroupMapperConfig.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/CommonLDAPGroupMapperConfig.java index 946abb840f5..bf91b1eacc0 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/CommonLDAPGroupMapperConfig.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/CommonLDAPGroupMapperConfig.java @@ -17,14 +17,14 @@ package org.keycloak.storage.ldap.mappers.membership; +import java.util.HashSet; +import java.util.Set; + import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.ModelException; import org.keycloak.storage.ldap.LDAPConfig; -import java.util.HashSet; -import java.util.Set; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/MembershipType.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/MembershipType.java index 1bc9aea2bfa..fe6207b5973 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/MembershipType.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/MembershipType.java @@ -17,6 +17,12 @@ package org.keycloak.storage.ldap.mappers.membership; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.storage.ldap.LDAPConfig; @@ -25,12 +31,6 @@ import org.keycloak.storage.ldap.LDAPUtils; import org.keycloak.storage.ldap.idm.model.LDAPDn; import org.keycloak.storage.ldap.idm.model.LDAPObject; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/UserRolesRetrieveStrategy.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/UserRolesRetrieveStrategy.java index 8acb9b3deec..bf70b2a0e2c 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/UserRolesRetrieveStrategy.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/UserRolesRetrieveStrategy.java @@ -18,6 +18,9 @@ package org.keycloak.storage.ldap.mappers.membership; +import java.util.List; +import java.util.Set; + import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -30,9 +33,6 @@ import org.keycloak.storage.ldap.idm.query.internal.LDAPQuery; import org.keycloak.storage.ldap.idm.query.internal.LDAPQueryConditionsBuilder; import org.keycloak.utils.StreamsUtil; -import java.util.List; -import java.util.Set; - /** * Strategy for how to retrieve LDAP roles of user * diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupLDAPStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupLDAPStorageMapper.java index bd403d366c8..25243e3f7dd 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupLDAPStorageMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupLDAPStorageMapper.java @@ -17,7 +17,20 @@ package org.keycloak.storage.ldap.mappers.membership.group; -import org.jboss.logging.Logger; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.ModelException; @@ -43,19 +56,7 @@ import org.keycloak.storage.ldap.mappers.membership.MembershipType; import org.keycloak.storage.ldap.mappers.membership.UserRolesRetrieveStrategy; import org.keycloak.storage.user.SynchronizationResult; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupLDAPStorageMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupLDAPStorageMapperFactory.java index 68549bf1fb7..9f6d58a7616 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupLDAPStorageMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupLDAPStorageMapperFactory.java @@ -17,6 +17,12 @@ package org.keycloak.storage.ldap.mappers.membership.group; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import org.keycloak.common.util.ObjectUtil; import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; @@ -39,12 +45,6 @@ import org.keycloak.storage.ldap.mappers.membership.MembershipType; import org.keycloak.storage.ldap.mappers.membership.UserRolesRetrieveStrategy; import org.keycloak.storage.ldap.mappers.membership.role.RoleMapperConfig; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupMapperConfig.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupMapperConfig.java index df7a0dc7f26..e21a15b34e6 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupMapperConfig.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupMapperConfig.java @@ -17,6 +17,9 @@ package org.keycloak.storage.ldap.mappers.membership.group; +import java.util.Collection; +import java.util.Collections; + import org.keycloak.common.util.ObjectUtil; import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; @@ -25,9 +28,6 @@ import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.mappers.AbstractLDAPStorageMapper; import org.keycloak.storage.ldap.mappers.membership.CommonLDAPGroupMapperConfig; -import java.util.Collection; -import java.util.Collections; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupTreeResolver.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupTreeResolver.java index 90e451ec446..440e0c53f50 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupTreeResolver.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/group/GroupTreeResolver.java @@ -17,8 +17,6 @@ package org.keycloak.storage.ldap.mappers.membership.group; -import org.jboss.logging.Logger; - import java.util.Arrays; import java.util.Collection; import java.util.Iterator; @@ -29,6 +27,8 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleLDAPStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleLDAPStorageMapper.java index 592686b6bd6..af7b6b85f22 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleLDAPStorageMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleLDAPStorageMapper.java @@ -17,7 +17,16 @@ package org.keycloak.storage.ldap.mappers.membership.role; -import org.jboss.logging.Logger; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.function.Consumer; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.ModelException; @@ -41,15 +50,7 @@ import org.keycloak.storage.ldap.mappers.membership.LDAPGroupMapperMode; import org.keycloak.storage.ldap.mappers.membership.UserRolesRetrieveStrategy; import org.keycloak.storage.user.SynchronizationResult; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.function.Consumer; -import java.util.stream.Stream; -import java.util.stream.Collectors; +import org.jboss.logging.Logger; /** * Map realm roles or roles of particular client to LDAP groups diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleLDAPStorageMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleLDAPStorageMapperFactory.java index 5c706ccf268..e0368a57a5c 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleLDAPStorageMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleLDAPStorageMapperFactory.java @@ -17,6 +17,12 @@ package org.keycloak.storage.ldap.mappers.membership.role; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; import org.keycloak.models.KeycloakSession; @@ -36,12 +42,6 @@ import org.keycloak.storage.ldap.mappers.membership.MembershipType; import org.keycloak.storage.ldap.mappers.membership.UserRolesRetrieveStrategy; import org.keycloak.storage.ldap.mappers.membership.group.GroupMapperConfig; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleMapperConfig.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleMapperConfig.java index 57317866f95..1a8154a2c11 100755 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleMapperConfig.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/membership/role/RoleMapperConfig.java @@ -17,14 +17,14 @@ package org.keycloak.storage.ldap.mappers.membership.role; +import java.util.Collection; + import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.ModelException; import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.mappers.membership.CommonLDAPGroupMapperConfig; -import java.util.Collection; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/LDAPServerPolicyHintsDecorator.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/LDAPServerPolicyHintsDecorator.java index 97a8f43b51c..f5b8d3df332 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/LDAPServerPolicyHintsDecorator.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/LDAPServerPolicyHintsDecorator.java @@ -21,10 +21,11 @@ import javax.naming.NamingException; import javax.naming.ldap.BasicControl; import javax.naming.ldap.LdapContext; -import org.jboss.logging.Logger; import org.keycloak.storage.ldap.idm.store.ldap.LDAPOperationManager; import org.keycloak.storage.ldap.mappers.LDAPOperationDecorator; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapper.java index 560bcb159fd..3cdf05ad1fd 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapper.java @@ -17,7 +17,14 @@ package org.keycloak.storage.ldap.mappers.msad; -import org.jboss.logging.Logger; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Stream; +import javax.naming.AuthenticationException; + import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.ModelException; @@ -34,14 +41,7 @@ import org.keycloak.storage.ldap.mappers.LDAPOperationDecorator; import org.keycloak.storage.ldap.mappers.PasswordUpdateCallback; import org.keycloak.storage.ldap.mappers.TxAwareLDAPUserModelDelegate; -import javax.naming.AuthenticationException; - -import java.util.Objects; -import java.util.Set; -import java.util.function.Function; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Stream; +import org.jboss.logging.Logger; /** * Mapper specific to MSAD. It's able to read the userAccountControl and pwdLastSet attributes and set actions in Keycloak based on that. diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapperFactory.java index 6082609f832..89dc9ea6599 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msad/MSADUserAccountControlStorageMapperFactory.java @@ -17,6 +17,8 @@ package org.keycloak.storage.ldap.mappers.msad; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; @@ -27,8 +29,6 @@ import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.mappers.AbstractLDAPStorageMapper; import org.keycloak.storage.ldap.mappers.AbstractLDAPStorageMapperFactory; -import java.util.List; - /** * @author Marek Posolda */ diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msadlds/MSADLDSUserAccountControlStorageMapper.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msadlds/MSADLDSUserAccountControlStorageMapper.java index c31566cc75e..b578701efbc 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msadlds/MSADLDSUserAccountControlStorageMapper.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msadlds/MSADLDSUserAccountControlStorageMapper.java @@ -17,7 +17,12 @@ package org.keycloak.storage.ldap.mappers.msadlds; -import org.jboss.logging.Logger; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Stream; +import javax.naming.AuthenticationException; + import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.ModelException; @@ -33,11 +38,7 @@ import org.keycloak.storage.ldap.mappers.AbstractLDAPStorageMapper; import org.keycloak.storage.ldap.mappers.LDAPOperationDecorator; import org.keycloak.storage.ldap.mappers.PasswordUpdateCallback; -import javax.naming.AuthenticationException; -import java.util.Objects; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Stream; +import org.jboss.logging.Logger; import static org.keycloak.storage.ldap.mappers.msad.MSADUserAccountControlStorageMapper.ALWAYS_READ_ENABLED_VALUE_FROM_LDAP; diff --git a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msadlds/MSADLDSUserAccountControlStorageMapperFactory.java b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msadlds/MSADLDSUserAccountControlStorageMapperFactory.java index 189c9c47f0f..3665615ca8c 100644 --- a/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msadlds/MSADLDSUserAccountControlStorageMapperFactory.java +++ b/federation/ldap/src/main/java/org/keycloak/storage/ldap/mappers/msadlds/MSADLDSUserAccountControlStorageMapperFactory.java @@ -17,6 +17,9 @@ package org.keycloak.storage.ldap.mappers.msadlds; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; @@ -28,9 +31,6 @@ import org.keycloak.storage.ldap.mappers.AbstractLDAPStorageMapper; import org.keycloak.storage.ldap.mappers.AbstractLDAPStorageMapperFactory; import org.keycloak.storage.ldap.mappers.msad.MSADUserAccountControlStorageMapper; -import java.util.ArrayList; -import java.util.List; - /** * @author Marek Posolda * @author Slawomir Dabek diff --git a/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/EscapeTest.java b/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/EscapeTest.java index 4bc0be76f70..47653bfc983 100644 --- a/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/EscapeTest.java +++ b/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/EscapeTest.java @@ -17,9 +17,10 @@ package org.keycloak.storage.ldap.idm.model; +import org.keycloak.storage.ldap.idm.query.EscapeStrategy; + import org.junit.Assert; import org.junit.Test; -import org.keycloak.storage.ldap.idm.query.EscapeStrategy; /** * @author Marek Posolda diff --git a/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/GroupTreeResolverTest.java b/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/GroupTreeResolverTest.java index c67536362f9..a81f4c38f44 100644 --- a/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/GroupTreeResolverTest.java +++ b/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/GroupTreeResolverTest.java @@ -17,13 +17,14 @@ package org.keycloak.storage.ldap.idm.model; -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.storage.ldap.mappers.membership.group.GroupTreeResolver; - import java.util.Arrays; import java.util.List; +import org.keycloak.storage.ldap.mappers.membership.group.GroupTreeResolver; + +import org.junit.Assert; +import org.junit.Test; + /** * @author Marek Posolda */ diff --git a/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/LDAPCapabilityTest.java b/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/LDAPCapabilityTest.java index 3843c7820f5..85e5d7cd2c2 100644 --- a/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/LDAPCapabilityTest.java +++ b/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/LDAPCapabilityTest.java @@ -1,16 +1,18 @@ package org.keycloak.storage.ldap.idm.model; +import java.util.LinkedHashSet; +import java.util.Set; + +import org.keycloak.representations.idm.LDAPCapabilityRepresentation; +import org.keycloak.representations.idm.LDAPCapabilityRepresentation.CapabilityType; +import org.keycloak.storage.ldap.idm.store.ldap.extended.PasswordModifyRequest; + +import org.junit.Test; + import static junit.framework.TestCase.assertFalse; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.util.LinkedHashSet; -import java.util.Set; -import org.junit.Test; -import org.keycloak.representations.idm.LDAPCapabilityRepresentation; -import org.keycloak.representations.idm.LDAPCapabilityRepresentation.CapabilityType; -import org.keycloak.storage.ldap.idm.store.ldap.extended.PasswordModifyRequest; - public class LDAPCapabilityTest { @Test diff --git a/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/LDAPMappersComparatorTest.java b/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/LDAPMappersComparatorTest.java index 4862c832b33..48977c71d12 100644 --- a/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/LDAPMappersComparatorTest.java +++ b/federation/ldap/src/test/java/org/keycloak/storage/ldap/idm/model/LDAPMappersComparatorTest.java @@ -17,8 +17,10 @@ package org.keycloak.storage.ldap.idm.model; -import org.junit.Assert; -import org.junit.Test; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; @@ -32,9 +34,8 @@ import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; import org.keycloak.storage.ldap.mappers.UserAttributeLDAPStorageMapper; import org.keycloak.storage.ldap.mappers.UserAttributeLDAPStorageMapperFactory; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; +import org.junit.Assert; +import org.junit.Test; /** * @author Marek Posolda diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/ArrayFrob.java b/federation/sssd/src/main/java/org/freedesktop/dbus/ArrayFrob.java index 90e323137d1..e7c3f38f35b 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/ArrayFrob.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/ArrayFrob.java @@ -1,7 +1,5 @@ package org.freedesktop.dbus; -import org.slf4j.LoggerFactory; - import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; @@ -10,6 +8,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.slf4j.LoggerFactory; + public final class ArrayFrob { private static final Map, Class> PRIMITIVE_TO_WRAPPER = new ConcurrentHashMap<>(); private static final Map, Class> WRAPPER_TO_PRIMITIVE = new ConcurrentHashMap<>(); diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/Container.java b/federation/sssd/src/main/java/org/freedesktop/dbus/Container.java index 1663c029d75..06ccfa68268 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/Container.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/Container.java @@ -1,8 +1,5 @@ package org.freedesktop.dbus; -import org.freedesktop.dbus.annotations.Position; -import org.slf4j.LoggerFactory; - import java.lang.reflect.Field; import java.lang.reflect.Type; import java.util.Arrays; @@ -11,6 +8,9 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; +import org.freedesktop.dbus.annotations.Position; +import org.slf4j.LoggerFactory; + /** * This class is the super class of both Structs and Tuples * and holds common methods. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/DBusAsyncReply.java b/federation/sssd/src/main/java/org/freedesktop/dbus/DBusAsyncReply.java index 653bab10b9b..7178fb0b8d0 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/DBusAsyncReply.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/DBusAsyncReply.java @@ -1,5 +1,7 @@ package org.freedesktop.dbus; +import java.lang.reflect.Method; + import org.freedesktop.dbus.connections.AbstractConnection; import org.freedesktop.dbus.errors.Error; import org.freedesktop.dbus.errors.NoReply; @@ -11,8 +13,6 @@ import org.freedesktop.dbus.messages.MethodReturn; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.reflect.Method; - /** * A handle to an asynchronous method call. */ diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/DBusMatchRule.java b/federation/sssd/src/main/java/org/freedesktop/dbus/DBusMatchRule.java index 1d29e27b0e4..36c64b9b775 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/DBusMatchRule.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/DBusMatchRule.java @@ -1,5 +1,12 @@ package org.freedesktop.dbus; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.regex.Pattern; + import org.freedesktop.dbus.errors.Error; import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.exceptions.DBusExecutionException; @@ -11,13 +18,6 @@ import org.freedesktop.dbus.messages.MethodReturn; import org.freedesktop.dbus.utils.DBusNamingUtil; import org.freedesktop.dbus.utils.Util; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Function; -import java.util.regex.Pattern; - /** * Defined a rule to match a message.
* This is mainly used to handle / take actions when signals arrive. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/FileDescriptor.java b/federation/sssd/src/main/java/org/freedesktop/dbus/FileDescriptor.java index 80997a10cc0..0b6d741440f 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/FileDescriptor.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/FileDescriptor.java @@ -1,13 +1,13 @@ package org.freedesktop.dbus; -import org.freedesktop.dbus.exceptions.MarshallingException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; +import org.freedesktop.dbus.exceptions.MarshallingException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Represents a FileDescriptor to be passed over the bus. Can be created from * either an integer(gotten through some JNI/JNA/JNR call) or from a diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/Marshalling.java b/federation/sssd/src/main/java/org/freedesktop/dbus/Marshalling.java index 5bfb1f06b64..881e66577d5 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/Marshalling.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/Marshalling.java @@ -1,5 +1,21 @@ package org.freedesktop.dbus; +import java.lang.reflect.Array; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.concurrent.ConcurrentHashMap; + import org.freedesktop.dbus.annotations.Position; import org.freedesktop.dbus.connections.AbstractConnection; import org.freedesktop.dbus.exceptions.DBusException; @@ -17,22 +33,6 @@ import org.freedesktop.dbus.utils.LoggingHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.reflect.Array; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.GenericArrayType; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.lang.reflect.TypeVariable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.concurrent.ConcurrentHashMap; - /** * Contains static methods for marshalling values. */ diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/MethodTuple.java b/federation/sssd/src/main/java/org/freedesktop/dbus/MethodTuple.java index 2c92d536739..e4694224afb 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/MethodTuple.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/MethodTuple.java @@ -1,10 +1,10 @@ package org.freedesktop.dbus; +import java.util.Objects; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Objects; - public class MethodTuple { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/RemoteInvocationHandler.java b/federation/sssd/src/main/java/org/freedesktop/dbus/RemoteInvocationHandler.java index f2d96e9b478..6580d9062c5 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/RemoteInvocationHandler.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/RemoteInvocationHandler.java @@ -1,5 +1,12 @@ package org.freedesktop.dbus; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.lang.reflect.Type; +import java.util.Arrays; + import org.freedesktop.dbus.annotations.MethodNoReply; import org.freedesktop.dbus.connections.AbstractConnection; import org.freedesktop.dbus.errors.Error; @@ -16,13 +23,6 @@ import org.freedesktop.dbus.utils.LoggingHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.lang.reflect.Type; -import java.util.Arrays; - public class RemoteInvocationHandler implements InvocationHandler { public static final int CALL_TYPE_SYNC = 0; public static final int CALL_TYPE_ASYNC = 1; diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/StructHelper.java b/federation/sssd/src/main/java/org/freedesktop/dbus/StructHelper.java index 85186b3368e..f68737e1407 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/StructHelper.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/StructHelper.java @@ -1,12 +1,12 @@ package org.freedesktop.dbus; -import org.freedesktop.dbus.types.DBusStructType; -import org.freedesktop.dbus.types.Variant; - import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.Arrays; +import org.freedesktop.dbus.types.DBusStructType; +import org.freedesktop.dbus.types.Variant; + /** * Helper util to create {@link Struct} subclasses when receiving it from DBus. * diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/TypeSignature.java b/federation/sssd/src/main/java/org/freedesktop/dbus/TypeSignature.java index a2e3e4893c6..c54ca047252 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/TypeSignature.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/TypeSignature.java @@ -1,9 +1,9 @@ package org.freedesktop.dbus; -import org.freedesktop.dbus.exceptions.DBusException; - import java.lang.reflect.Type; +import org.freedesktop.dbus.exceptions.DBusException; + public class TypeSignature { // CHECKSTYLE:OFF String sig; diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/annotations/DBusProperty.java b/federation/sssd/src/main/java/org/freedesktop/dbus/annotations/DBusProperty.java index c815c6e458f..a4844a136ea 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/annotations/DBusProperty.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/annotations/DBusProperty.java @@ -1,13 +1,13 @@ package org.freedesktop.dbus.annotations; -import org.freedesktop.dbus.types.Variant; - import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.freedesktop.dbus.types.Variant; + /** * Appends information about properties in the interface. The annotated properties are added to the introspection data. * In case of complex type of the property please use {@link org.freedesktop.dbus.TypeRef}. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/AbstractConnection.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/AbstractConnection.java index f11ee68bf97..52a9a7611ed 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/AbstractConnection.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/AbstractConnection.java @@ -1,5 +1,32 @@ package org.freedesktop.dbus.connections; +import java.io.Closeable; +import java.io.EOFException; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.nio.ByteOrder; +import java.nio.channels.ClosedByInterruptException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Optional; +import java.util.Queue; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.regex.Pattern; + import org.freedesktop.dbus.DBusAsyncReply; import org.freedesktop.dbus.DBusCallInfo; import org.freedesktop.dbus.DBusMatchRule; @@ -32,33 +59,6 @@ import org.freedesktop.dbus.utils.NameableThreadFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Closeable; -import java.io.EOFException; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Type; -import java.nio.ByteOrder; -import java.nio.channels.ClosedByInterruptException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Optional; -import java.util.Queue; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.regex.Pattern; - /** * Handles a connection to DBus. */ diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/BusAddress.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/BusAddress.java index 34f3516bded..3d61582154f 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/BusAddress.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/BusAddress.java @@ -1,16 +1,16 @@ package org.freedesktop.dbus.connections; -import org.freedesktop.dbus.exceptions.DBusException; -import org.freedesktop.dbus.exceptions.InvalidBusAddressException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Collections; import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; import java.util.stream.Collectors; +import org.freedesktop.dbus.exceptions.DBusException; +import org.freedesktop.dbus.exceptions.InvalidBusAddressException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Defines an address to connect to DBus. * The address will define which transport to use. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/FallbackContainer.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/FallbackContainer.java index d113fc45f17..8001a442e66 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/FallbackContainer.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/FallbackContainer.java @@ -1,14 +1,14 @@ package org.freedesktop.dbus.connections; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + import org.freedesktop.dbus.messages.ExportedObject; import org.freedesktop.dbus.utils.LoggingHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Map; - public class FallbackContainer { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/IncomingMessageThread.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/IncomingMessageThread.java index 88851eeb79e..a9ae9c9aaa7 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/IncomingMessageThread.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/IncomingMessageThread.java @@ -1,5 +1,9 @@ package org.freedesktop.dbus.connections; +import java.io.IOException; +import java.util.Objects; +import java.util.concurrent.RejectedExecutionException; + import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.exceptions.IllegalThreadPoolStateException; import org.freedesktop.dbus.interfaces.FatalException; @@ -7,10 +11,6 @@ import org.freedesktop.dbus.messages.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.util.Objects; -import java.util.concurrent.RejectedExecutionException; - public class IncomingMessageThread extends Thread { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/PeerSet.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/PeerSet.java index 0b7b6a91c31..2aa779c997c 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/PeerSet.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/PeerSet.java @@ -1,5 +1,10 @@ package org.freedesktop.dbus.connections; +import java.util.Collection; +import java.util.Iterator; +import java.util.Set; +import java.util.TreeSet; + import org.freedesktop.dbus.DBusMatchRule; import org.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.exceptions.DBusException; @@ -8,11 +13,6 @@ import org.freedesktop.dbus.interfaces.DBusSigHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collection; -import java.util.Iterator; -import java.util.Set; -import java.util.TreeSet; - /** * Add addresses of peers to a set which will watch for them to * disappear and automatically remove them from the set. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/PendingCallbackManager.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/PendingCallbackManager.java index f8db64b12f2..e7a0114ce75 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/PendingCallbackManager.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/PendingCallbackManager.java @@ -1,13 +1,13 @@ package org.freedesktop.dbus.connections; -import org.freedesktop.dbus.DBusAsyncReply; -import org.freedesktop.dbus.interfaces.CallbackHandler; -import org.freedesktop.dbus.messages.MethodCall; - import java.lang.reflect.Method; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.freedesktop.dbus.DBusAsyncReply; +import org.freedesktop.dbus.interfaces.CallbackHandler; +import org.freedesktop.dbus.messages.MethodCall; + public class PendingCallbackManager { private final Map> pendingCallbacks; private final Map> pendingCallbackReplys; diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/ReceivingService.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/ReceivingService.java index 27970a119f0..5814252fa0a 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/ReceivingService.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/ReceivingService.java @@ -1,12 +1,5 @@ package org.freedesktop.dbus.connections; -import org.freedesktop.dbus.connections.config.ReceivingServiceConfig; -import org.freedesktop.dbus.connections.config.ReceivingServiceConfigBuilder; -import org.freedesktop.dbus.exceptions.IllegalThreadPoolStateException; -import org.freedesktop.dbus.utils.NameableThreadFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.util.Map; import java.util.Map.Entry; import java.util.Optional; @@ -15,6 +8,13 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; +import org.freedesktop.dbus.connections.config.ReceivingServiceConfig; +import org.freedesktop.dbus.connections.config.ReceivingServiceConfigBuilder; +import org.freedesktop.dbus.exceptions.IllegalThreadPoolStateException; +import org.freedesktop.dbus.utils.NameableThreadFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Service providing threads for every type of message expected to be received by DBus. * diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/SASL.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/SASL.java index 95f0d566050..1a2db9124a4 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/SASL.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/SASL.java @@ -1,29 +1,5 @@ package org.freedesktop.dbus.connections; -import static org.freedesktop.dbus.connections.SASL.SaslCommand.AGREE_UNIX_FD; -import static org.freedesktop.dbus.connections.SASL.SaslCommand.AUTH; -import static org.freedesktop.dbus.connections.SASL.SaslCommand.BEGIN; -import static org.freedesktop.dbus.connections.SASL.SaslCommand.CANCEL; -import static org.freedesktop.dbus.connections.SASL.SaslCommand.DATA; -import static org.freedesktop.dbus.connections.SASL.SaslCommand.ERROR; -import static org.freedesktop.dbus.connections.SASL.SaslCommand.NEGOTIATE_UNIX_FD; -import static org.freedesktop.dbus.connections.SASL.SaslCommand.REJECTED; - -import com.sun.security.auth.module.UnixSystem; -import org.freedesktop.dbus.config.DBusSysProps; -import org.freedesktop.dbus.connections.config.SaslConfig; -import org.freedesktop.dbus.connections.transports.AbstractTransport; -import org.freedesktop.dbus.connections.transports.AbstractUnixTransport; -import org.freedesktop.dbus.exceptions.AuthenticationException; -import org.freedesktop.dbus.exceptions.SocketClosedException; -import org.freedesktop.dbus.messages.Message; -import org.freedesktop.dbus.utils.Hexdump; -import org.freedesktop.dbus.utils.LoggingHelper; -import org.freedesktop.dbus.utils.TimeMeasure; -import org.freedesktop.dbus.utils.Util; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -49,6 +25,30 @@ import java.util.Optional; import java.util.Random; import java.util.Set; +import com.sun.security.auth.module.UnixSystem; +import org.freedesktop.dbus.config.DBusSysProps; +import org.freedesktop.dbus.connections.config.SaslConfig; +import org.freedesktop.dbus.connections.transports.AbstractTransport; +import org.freedesktop.dbus.connections.transports.AbstractUnixTransport; +import org.freedesktop.dbus.exceptions.AuthenticationException; +import org.freedesktop.dbus.exceptions.SocketClosedException; +import org.freedesktop.dbus.messages.Message; +import org.freedesktop.dbus.utils.Hexdump; +import org.freedesktop.dbus.utils.LoggingHelper; +import org.freedesktop.dbus.utils.TimeMeasure; +import org.freedesktop.dbus.utils.Util; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.freedesktop.dbus.connections.SASL.SaslCommand.AGREE_UNIX_FD; +import static org.freedesktop.dbus.connections.SASL.SaslCommand.AUTH; +import static org.freedesktop.dbus.connections.SASL.SaslCommand.BEGIN; +import static org.freedesktop.dbus.connections.SASL.SaslCommand.CANCEL; +import static org.freedesktop.dbus.connections.SASL.SaslCommand.DATA; +import static org.freedesktop.dbus.connections.SASL.SaslCommand.ERROR; +import static org.freedesktop.dbus.connections.SASL.SaslCommand.NEGOTIATE_UNIX_FD; +import static org.freedesktop.dbus.connections.SASL.SaslCommand.REJECTED; + public class SASL { public static final int AUTH_NONE = 0; public static final int AUTH_EXTERNAL = 1; diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/SenderThread.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/SenderThread.java index 45c59beee62..af89c22d7e0 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/SenderThread.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/SenderThread.java @@ -1,11 +1,11 @@ package org.freedesktop.dbus.connections; +import java.util.concurrent.LinkedBlockingQueue; + import org.freedesktop.dbus.messages.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.concurrent.LinkedBlockingQueue; - public class SenderThread extends Thread { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/ReceivingServiceConfigBuilder.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/ReceivingServiceConfigBuilder.java index 186b0ffb064..a1aff35bd0b 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/ReceivingServiceConfigBuilder.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/ReceivingServiceConfigBuilder.java @@ -1,5 +1,8 @@ package org.freedesktop.dbus.connections.config; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Supplier; + import org.freedesktop.dbus.connections.ReceivingService; import org.freedesktop.dbus.connections.ReceivingService.ExecutorNames; import org.freedesktop.dbus.connections.ReceivingService.IThreadPoolRetryHandler; @@ -7,9 +10,6 @@ import org.freedesktop.dbus.connections.impl.BaseConnectionBuilder; import org.freedesktop.dbus.utils.Util; import org.slf4j.LoggerFactory; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Supplier; - /** * Configuration builder to configure {@link ReceivingService}. * Only intended to be used in combination with {@link BaseConnectionBuilder} diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/SaslConfig.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/SaslConfig.java index b449ee99ec5..9d3d30f4ff4 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/SaslConfig.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/SaslConfig.java @@ -1,10 +1,10 @@ package org.freedesktop.dbus.connections.config; +import java.util.OptionalLong; + import org.freedesktop.dbus.connections.SASL; import org.freedesktop.dbus.connections.SASL.SaslMode; -import java.util.OptionalLong; - /** * Bean contains configuration for SASL authentication. * diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/SaslConfigBuilder.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/SaslConfigBuilder.java index f7732c79a72..7581ec1c686 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/SaslConfigBuilder.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/SaslConfigBuilder.java @@ -1,10 +1,10 @@ package org.freedesktop.dbus.connections.config; -import org.freedesktop.dbus.connections.transports.TransportBuilder.SaslAuthMode; - import java.util.OptionalLong; import java.util.function.Supplier; +import org.freedesktop.dbus.connections.transports.TransportBuilder.SaslAuthMode; + /** * Configuration used to setup a sasl authentication. * diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/TransportConfig.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/TransportConfig.java index d241fbedc59..cce296038dc 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/TransportConfig.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/TransportConfig.java @@ -1,9 +1,5 @@ package org.freedesktop.dbus.connections.config; -import org.freedesktop.dbus.connections.BusAddress; -import org.freedesktop.dbus.connections.transports.AbstractTransport; -import org.freedesktop.dbus.utils.Util; - import java.nio.file.attribute.PosixFilePermission; import java.util.Arrays; import java.util.LinkedHashMap; @@ -13,6 +9,10 @@ import java.util.Objects; import java.util.Set; import java.util.function.Consumer; +import org.freedesktop.dbus.connections.BusAddress; +import org.freedesktop.dbus.connections.transports.AbstractTransport; +import org.freedesktop.dbus.utils.Util; + /** * Configuration used to setup a transport. * diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/TransportConfigBuilder.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/TransportConfigBuilder.java index 44899872a5e..e863e6ab097 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/TransportConfigBuilder.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/config/TransportConfigBuilder.java @@ -1,14 +1,14 @@ package org.freedesktop.dbus.connections.config; -import org.freedesktop.dbus.connections.BusAddress; -import org.freedesktop.dbus.connections.transports.AbstractTransport; -import org.freedesktop.dbus.connections.transports.TransportBuilder.SaslAuthMode; - import java.nio.file.attribute.PosixFilePermission; import java.util.Objects; import java.util.function.Consumer; import java.util.function.Supplier; +import org.freedesktop.dbus.connections.BusAddress; +import org.freedesktop.dbus.connections.transports.AbstractTransport; +import org.freedesktop.dbus.connections.transports.TransportBuilder.SaslAuthMode; + public class TransportConfigBuilder, R> { private final Supplier connectionBuilder; diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/BaseConnectionBuilder.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/BaseConnectionBuilder.java index af60f895e38..33b88a26068 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/BaseConnectionBuilder.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/BaseConnectionBuilder.java @@ -1,5 +1,7 @@ package org.freedesktop.dbus.connections.impl; +import java.nio.ByteOrder; + import org.freedesktop.dbus.connections.AbstractConnection; import org.freedesktop.dbus.connections.BusAddress; import org.freedesktop.dbus.connections.IDisconnectCallback; @@ -13,8 +15,6 @@ import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.messages.Message; import org.freedesktop.dbus.messages.Message.Endian; -import java.nio.ByteOrder; - /** * Base class for connection builders containing commonly used options. * diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnection.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnection.java index a8c4743ea57..d8f51cd94b6 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnection.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnection.java @@ -1,8 +1,22 @@ package org.freedesktop.dbus.connections.impl; -import static org.freedesktop.dbus.utils.CommonRegexPattern.DBUS_IFACE_PATTERN; -import static org.freedesktop.dbus.utils.CommonRegexPattern.IFACE_PATTERN; -import static org.freedesktop.dbus.utils.CommonRegexPattern.PROXY_SPLIT_PATTERN; +import java.io.IOException; +import java.lang.reflect.Proxy; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Queue; +import java.util.Set; +import java.util.TreeSet; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; import org.freedesktop.dbus.DBusMatchRule; import org.freedesktop.dbus.RemoteInvocationHandler; @@ -27,23 +41,9 @@ import org.freedesktop.dbus.utils.AddressBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.lang.reflect.Proxy; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Queue; -import java.util.Set; -import java.util.TreeSet; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; +import static org.freedesktop.dbus.utils.CommonRegexPattern.DBUS_IFACE_PATTERN; +import static org.freedesktop.dbus.utils.CommonRegexPattern.IFACE_PATTERN; +import static org.freedesktop.dbus.utils.CommonRegexPattern.PROXY_SPLIT_PATTERN; /** * Handles a connection to DBus. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnectionBuilder.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnectionBuilder.java index 2953d5aee23..9c7632b7e6b 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnectionBuilder.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/impl/DBusConnectionBuilder.java @@ -1,6 +1,6 @@ package org.freedesktop.dbus.connections.impl; -import static org.freedesktop.dbus.utils.AddressBuilder.getDbusMachineId; +import java.nio.ByteOrder; import org.freedesktop.dbus.connections.BusAddress; import org.freedesktop.dbus.connections.config.ReceivingServiceConfig; @@ -12,7 +12,7 @@ import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.messages.Message; import org.freedesktop.dbus.utils.AddressBuilder; -import java.nio.ByteOrder; +import static org.freedesktop.dbus.utils.AddressBuilder.getDbusMachineId; /** * Builder to create a new DBusConnection. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/AbstractTransport.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/AbstractTransport.java index c78b6d23002..0fa7aa0ee1b 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/AbstractTransport.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/AbstractTransport.java @@ -1,5 +1,14 @@ package org.freedesktop.dbus.connections.transports; +import java.io.Closeable; +import java.io.IOException; +import java.nio.channels.SocketChannel; +import java.util.Objects; +import java.util.ServiceConfigurationError; +import java.util.ServiceLoader; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Consumer; + import org.freedesktop.dbus.connections.BusAddress; import org.freedesktop.dbus.connections.SASL; import org.freedesktop.dbus.connections.config.SaslConfig; @@ -16,15 +25,6 @@ import org.freedesktop.dbus.spi.message.OutputStreamMessageWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.Closeable; -import java.io.IOException; -import java.nio.channels.SocketChannel; -import java.util.Objects; -import java.util.ServiceConfigurationError; -import java.util.ServiceLoader; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Consumer; - /** * Base class for all transport types. * diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/AbstractUnixTransport.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/AbstractUnixTransport.java index 9880d622eb3..7a6071c36d7 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/AbstractUnixTransport.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/AbstractUnixTransport.java @@ -1,11 +1,11 @@ package org.freedesktop.dbus.connections.transports; -import org.freedesktop.dbus.connections.BusAddress; -import org.freedesktop.dbus.connections.config.TransportConfig; - import java.io.IOException; import java.nio.channels.SocketChannel; +import org.freedesktop.dbus.connections.BusAddress; +import org.freedesktop.dbus.connections.config.TransportConfig; + public abstract class AbstractUnixTransport extends AbstractTransport { protected AbstractUnixTransport(BusAddress _address, TransportConfig _config) { diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/IFileBasedBusAddress.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/IFileBasedBusAddress.java index b3ad9714fb4..e314a64add1 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/IFileBasedBusAddress.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/IFileBasedBusAddress.java @@ -1,10 +1,10 @@ package org.freedesktop.dbus.connections.transports; -import org.freedesktop.dbus.connections.BusAddress; - import java.nio.file.attribute.PosixFilePermission; import java.util.Set; +import org.freedesktop.dbus.connections.BusAddress; + /** * Interface which should be implemented by {@link BusAddress} subclasses which use * files as 'address' (e.g. unix sockets) and needs to set permission on those files. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/TransportBuilder.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/TransportBuilder.java index 0878d8b4f45..e08ffdfaad8 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/TransportBuilder.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/TransportBuilder.java @@ -1,5 +1,16 @@ package org.freedesktop.dbus.connections.transports; +import java.io.IOException; +import java.nio.file.attribute.PosixFilePermission; +import java.util.ArrayList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.ServiceConfigurationError; +import java.util.ServiceLoader; +import java.util.concurrent.ConcurrentHashMap; + import org.freedesktop.dbus.connections.AbstractConnection; import org.freedesktop.dbus.connections.BusAddress; import org.freedesktop.dbus.connections.SASL; @@ -12,17 +23,6 @@ import org.freedesktop.dbus.spi.transport.ITransportProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.nio.file.attribute.PosixFilePermission; -import java.util.ArrayList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.ServiceConfigurationError; -import java.util.ServiceLoader; -import java.util.concurrent.ConcurrentHashMap; - /** * Builder to create transports of different types. * diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/TransportConnection.java b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/TransportConnection.java index 300714ac9f6..750d914ae09 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/TransportConnection.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/connections/transports/TransportConnection.java @@ -1,13 +1,13 @@ package org.freedesktop.dbus.connections.transports; -import org.freedesktop.dbus.spi.message.IMessageReader; -import org.freedesktop.dbus.spi.message.IMessageWriter; - import java.io.Closeable; import java.io.IOException; import java.nio.channels.SocketChannel; import java.util.concurrent.atomic.AtomicLong; +import org.freedesktop.dbus.spi.message.IMessageReader; +import org.freedesktop.dbus.spi.message.IMessageWriter; + /** * Represents one transport connection of any type.
*

diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/errors/Error.java b/federation/sssd/src/main/java/org/freedesktop/dbus/errors/Error.java index 161e11aa7f5..ebed9afe52e 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/errors/Error.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/errors/Error.java @@ -1,7 +1,13 @@ package org.freedesktop.dbus.errors; -import static org.freedesktop.dbus.utils.CommonRegexPattern.EXCEPTION_EXTRACT_PATTERN; -import static org.freedesktop.dbus.utils.CommonRegexPattern.EXCEPTION_PARTIAL_PATTERN; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; import org.freedesktop.dbus.connections.AbstractConnection; import org.freedesktop.dbus.connections.impl.DBusConnection; @@ -12,14 +18,8 @@ import org.freedesktop.dbus.messages.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; +import static org.freedesktop.dbus.utils.CommonRegexPattern.EXCEPTION_EXTRACT_PATTERN; +import static org.freedesktop.dbus.utils.CommonRegexPattern.EXCEPTION_PARTIAL_PATTERN; /** * Error messages which can be sent over the bus. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/exceptions/MessageProtocolVersionException.java b/federation/sssd/src/main/java/org/freedesktop/dbus/exceptions/MessageProtocolVersionException.java index cd42231e3e3..bb7d8bcda6b 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/exceptions/MessageProtocolVersionException.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/exceptions/MessageProtocolVersionException.java @@ -1,9 +1,9 @@ package org.freedesktop.dbus.exceptions; -import org.freedesktop.dbus.interfaces.FatalException; - import java.io.IOException; +import org.freedesktop.dbus.interfaces.FatalException; + public class MessageProtocolVersionException extends IOException implements FatalException { private static final long serialVersionUID = 3107039118803575407L; diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/exceptions/MessageTypeException.java b/federation/sssd/src/main/java/org/freedesktop/dbus/exceptions/MessageTypeException.java index cf7c96a2e93..0784ea39609 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/exceptions/MessageTypeException.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/exceptions/MessageTypeException.java @@ -1,9 +1,9 @@ package org.freedesktop.dbus.exceptions; -import org.freedesktop.dbus.interfaces.NonFatalException; - import java.io.IOException; +import org.freedesktop.dbus.interfaces.NonFatalException; + public class MessageTypeException extends IOException implements NonFatalException { private static final long serialVersionUID = 935695242304001622L; diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/DBus.java b/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/DBus.java index 6e8cb53982c..89332170227 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/DBus.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/DBus.java @@ -1,5 +1,7 @@ package org.freedesktop.dbus.interfaces; +import java.util.Map; + import org.freedesktop.dbus.annotations.DBusInterfaceName; import org.freedesktop.dbus.errors.MatchRuleInvalid; import org.freedesktop.dbus.exceptions.DBusException; @@ -7,8 +9,6 @@ import org.freedesktop.dbus.messages.DBusSignal; import org.freedesktop.dbus.types.UInt32; import org.freedesktop.dbus.types.Variant; -import java.util.Map; - @SuppressWarnings({"checkstyle:methodname"}) @DBusInterfaceName("org.freedesktop.DBus") public interface DBus extends DBusInterface { diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/ObjectManager.java b/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/ObjectManager.java index 7b4b3d1aaf1..99e92194952 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/ObjectManager.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/ObjectManager.java @@ -1,14 +1,14 @@ package org.freedesktop.dbus.interfaces; +import java.util.List; +import java.util.Map; + import org.freedesktop.dbus.DBusPath; import org.freedesktop.dbus.annotations.DBusInterfaceName; import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.messages.DBusSignal; import org.freedesktop.dbus.types.Variant; -import java.util.List; -import java.util.Map; - @DBusInterfaceName("org.freedesktop.DBus.ObjectManager") @SuppressWarnings({"checkstyle:methodname", "checkstyle:visibilitymodifier"}) public interface ObjectManager extends DBusInterface { diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/Properties.java b/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/Properties.java index 91ab3c03698..af30c3ffd06 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/Properties.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/interfaces/Properties.java @@ -1,13 +1,13 @@ package org.freedesktop.dbus.interfaces; +import java.util.List; +import java.util.Map; + import org.freedesktop.dbus.annotations.DBusInterfaceName; import org.freedesktop.dbus.exceptions.DBusException; import org.freedesktop.dbus.messages.DBusSignal; import org.freedesktop.dbus.types.Variant; -import java.util.List; -import java.util.Map; - /** * A standard properties interface. */ diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/DBusSignal.java b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/DBusSignal.java index c0dd6a81a10..0c9cb624c7b 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/DBusSignal.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/DBusSignal.java @@ -1,6 +1,16 @@ package org.freedesktop.dbus.messages; -import static org.freedesktop.dbus.connections.AbstractConnection.OBJECT_REGEX_PATTERN; +import java.lang.invoke.MethodType; +import java.lang.reflect.Constructor; +import java.lang.reflect.GenericDeclaration; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; import org.freedesktop.dbus.DBusMatchRule; import org.freedesktop.dbus.Marshalling; @@ -16,17 +26,7 @@ import org.freedesktop.dbus.utils.DBusNamingUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.invoke.MethodType; -import java.lang.reflect.Constructor; -import java.lang.reflect.GenericDeclaration; -import java.lang.reflect.Type; -import java.lang.reflect.TypeVariable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; +import static org.freedesktop.dbus.connections.AbstractConnection.OBJECT_REGEX_PATTERN; public class DBusSignal extends Message { private static final Logger LOGGER = diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/ExportedObject.java b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/ExportedObject.java index 64218ccbfa5..8ae6766688a 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/ExportedObject.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/ExportedObject.java @@ -1,24 +1,5 @@ package org.freedesktop.dbus.messages; -import org.freedesktop.dbus.Marshalling; -import org.freedesktop.dbus.MethodTuple; -import org.freedesktop.dbus.StrongReference; -import org.freedesktop.dbus.Tuple; -import org.freedesktop.dbus.TypeRef; -import org.freedesktop.dbus.annotations.DBusIgnore; -import org.freedesktop.dbus.annotations.DBusInterfaceName; -import org.freedesktop.dbus.annotations.DBusMemberName; -import org.freedesktop.dbus.annotations.DBusProperties; -import org.freedesktop.dbus.annotations.DBusProperty; -import org.freedesktop.dbus.connections.AbstractConnection; -import org.freedesktop.dbus.exceptions.DBusException; -import org.freedesktop.dbus.exceptions.DBusExecutionException; -import org.freedesktop.dbus.interfaces.DBusInterface; -import org.freedesktop.dbus.interfaces.Introspectable; -import org.freedesktop.dbus.interfaces.Peer; -import org.freedesktop.dbus.utils.DBusNamingUtil; -import org.slf4j.LoggerFactory; - import java.lang.annotation.Annotation; import java.lang.ref.Reference; import java.lang.ref.WeakReference; @@ -39,6 +20,25 @@ import java.util.Objects; import java.util.Queue; import java.util.Set; +import org.freedesktop.dbus.Marshalling; +import org.freedesktop.dbus.MethodTuple; +import org.freedesktop.dbus.StrongReference; +import org.freedesktop.dbus.Tuple; +import org.freedesktop.dbus.TypeRef; +import org.freedesktop.dbus.annotations.DBusIgnore; +import org.freedesktop.dbus.annotations.DBusInterfaceName; +import org.freedesktop.dbus.annotations.DBusMemberName; +import org.freedesktop.dbus.annotations.DBusProperties; +import org.freedesktop.dbus.annotations.DBusProperty; +import org.freedesktop.dbus.connections.AbstractConnection; +import org.freedesktop.dbus.exceptions.DBusException; +import org.freedesktop.dbus.exceptions.DBusExecutionException; +import org.freedesktop.dbus.interfaces.DBusInterface; +import org.freedesktop.dbus.interfaces.Introspectable; +import org.freedesktop.dbus.interfaces.Peer; +import org.freedesktop.dbus.utils.DBusNamingUtil; +import org.slf4j.LoggerFactory; + public class ExportedObject { private final Map methods = new HashMap<>(); private final String introspectionData; diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/Message.java b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/Message.java index ea84db25fce..c1b155a5d33 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/Message.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/Message.java @@ -1,5 +1,18 @@ package org.freedesktop.dbus.messages; +import java.lang.reflect.Array; +import java.lang.reflect.Type; +import java.nio.charset.StandardCharsets; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.BiFunction; +import java.util.stream.Collectors; + import org.freedesktop.dbus.ArrayFrob; import org.freedesktop.dbus.Container; import org.freedesktop.dbus.DBusMap; @@ -21,19 +34,6 @@ import org.freedesktop.dbus.utils.LoggingHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.lang.reflect.Array; -import java.lang.reflect.Type; -import java.nio.charset.StandardCharsets; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.BiFunction; -import java.util.stream.Collectors; - /** * Superclass of all messages which are sent over the Bus. This class deals with all the marshalling to/from the wire * format. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MessageFactory.java b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MessageFactory.java index 17b5ad94fd6..696146240c0 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MessageFactory.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MessageFactory.java @@ -1,5 +1,7 @@ package org.freedesktop.dbus.messages; +import java.util.List; + import org.freedesktop.dbus.FileDescriptor; import org.freedesktop.dbus.errors.Error; import org.freedesktop.dbus.exceptions.DBusException; @@ -8,8 +10,6 @@ import org.freedesktop.dbus.utils.Hexdump; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; - public final class MessageFactory { private static final Logger LOGGER = LoggerFactory.getLogger(MessageFactory.class); diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodBase.java b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodBase.java index 299b77a257d..2b5e341ce97 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodBase.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodBase.java @@ -1,13 +1,13 @@ package org.freedesktop.dbus.messages; -import org.freedesktop.dbus.FileDescriptor; -import org.freedesktop.dbus.exceptions.DBusException; -import org.freedesktop.dbus.types.UInt32; - import java.util.Arrays; import java.util.List; import java.util.Objects; +import org.freedesktop.dbus.FileDescriptor; +import org.freedesktop.dbus.exceptions.DBusException; +import org.freedesktop.dbus.types.UInt32; + public abstract class MethodBase extends Message { MethodBase() { diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodCall.java b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodCall.java index ef1eb16d972..557204ef139 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodCall.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodCall.java @@ -1,13 +1,13 @@ package org.freedesktop.dbus.messages; -import org.freedesktop.dbus.connections.impl.DBusConnection; -import org.freedesktop.dbus.exceptions.DBusException; -import org.freedesktop.dbus.exceptions.MessageFormatException; - import java.time.Duration; import java.util.ArrayList; import java.util.List; +import org.freedesktop.dbus.connections.impl.DBusConnection; +import org.freedesktop.dbus.exceptions.DBusException; +import org.freedesktop.dbus.exceptions.MessageFormatException; + public class MethodCall extends MethodBase { private static long replyWaitTimeout = Duration.ofSeconds(20).toMillis(); diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodReturn.java b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodReturn.java index f82ab511235..30fed2bf129 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodReturn.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/MethodReturn.java @@ -1,11 +1,11 @@ package org.freedesktop.dbus.messages; -import org.freedesktop.dbus.connections.impl.DBusConnection; -import org.freedesktop.dbus.exceptions.DBusException; - import java.util.ArrayList; import java.util.List; +import org.freedesktop.dbus.connections.impl.DBusConnection; +import org.freedesktop.dbus.exceptions.DBusException; + public class MethodReturn extends MethodBase { private MethodCall call; diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/ObjectTree.java b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/ObjectTree.java index f46aa36d0de..857796d2fd7 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/messages/ObjectTree.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/messages/ObjectTree.java @@ -1,10 +1,10 @@ package org.freedesktop.dbus.messages; +import java.util.regex.Pattern; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.regex.Pattern; - /** * Keeps track of the exported objects for introspection data */ public class ObjectTree { diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/IMessageReader.java b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/IMessageReader.java index b607c80b074..707753e4cd7 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/IMessageReader.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/IMessageReader.java @@ -1,11 +1,11 @@ package org.freedesktop.dbus.spi.message; -import org.freedesktop.dbus.exceptions.DBusException; -import org.freedesktop.dbus.messages.Message; - import java.io.Closeable; import java.io.IOException; +import org.freedesktop.dbus.exceptions.DBusException; +import org.freedesktop.dbus.messages.Message; + /** * Represents a way to read messages from the bus. */ diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/IMessageWriter.java b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/IMessageWriter.java index 75c275a0a19..2446d97a7a5 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/IMessageWriter.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/IMessageWriter.java @@ -1,10 +1,10 @@ package org.freedesktop.dbus.spi.message; -import org.freedesktop.dbus.messages.Message; - import java.io.Closeable; import java.io.IOException; +import org.freedesktop.dbus.messages.Message; + /** * Interface that lets you write a message to the currently used transport. */ diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/ISocketProvider.java b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/ISocketProvider.java index 0215bf211ae..a479c9cb1e4 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/ISocketProvider.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/ISocketProvider.java @@ -1,10 +1,10 @@ package org.freedesktop.dbus.spi.message; -import org.freedesktop.dbus.connections.transports.AbstractTransport; - import java.io.IOException; import java.nio.channels.SocketChannel; +import org.freedesktop.dbus.connections.transports.AbstractTransport; + public interface ISocketProvider { /** * Method to create a {@link IMessageReader} implementation. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/InputStreamMessageReader.java b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/InputStreamMessageReader.java index fd513fc4b5b..93b4bf4ee09 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/InputStreamMessageReader.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/InputStreamMessageReader.java @@ -1,12 +1,5 @@ package org.freedesktop.dbus.spi.message; -import org.freedesktop.dbus.exceptions.DBusException; -import org.freedesktop.dbus.exceptions.MessageProtocolVersionException; -import org.freedesktop.dbus.messages.Message; -import org.freedesktop.dbus.messages.MessageFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.EOFException; import java.io.IOException; import java.net.SocketTimeoutException; @@ -15,6 +8,13 @@ import java.nio.channels.SocketChannel; import java.util.Arrays; import java.util.Objects; +import org.freedesktop.dbus.exceptions.DBusException; +import org.freedesktop.dbus.exceptions.MessageProtocolVersionException; +import org.freedesktop.dbus.messages.Message; +import org.freedesktop.dbus.messages.MessageFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class InputStreamMessageReader implements IMessageReader { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/OutputStreamMessageWriter.java b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/OutputStreamMessageWriter.java index 2c9eb133de8..520ffc41be3 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/OutputStreamMessageWriter.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/message/OutputStreamMessageWriter.java @@ -1,14 +1,14 @@ package org.freedesktop.dbus.spi.message; +import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.channels.SocketChannel; + import org.freedesktop.dbus.messages.Message; import org.freedesktop.dbus.utils.Hexdump; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.channels.SocketChannel; - public class OutputStreamMessageWriter implements IMessageWriter { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/transport/ITransportProvider.java b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/transport/ITransportProvider.java index de2b07b455f..cc86369c698 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/spi/transport/ITransportProvider.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/spi/transport/ITransportProvider.java @@ -1,14 +1,13 @@ package org.freedesktop.dbus.spi.transport; +import java.util.ServiceLoader; +import javax.xml.transform.TransformerConfigurationException; + import org.freedesktop.dbus.connections.BusAddress; import org.freedesktop.dbus.connections.config.TransportConfig; import org.freedesktop.dbus.connections.transports.AbstractTransport; import org.freedesktop.dbus.exceptions.TransportConfigurationException; -import java.util.ServiceLoader; - -import javax.xml.transform.TransformerConfigurationException; - /** * Interface used by {@link ServiceLoader} to provide a transport used by DBus. * diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/types/DBusStructType.java b/federation/sssd/src/main/java/org/freedesktop/dbus/types/DBusStructType.java index d70521983b6..e2fc1ff995c 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/types/DBusStructType.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/types/DBusStructType.java @@ -1,10 +1,10 @@ package org.freedesktop.dbus.types; -import org.freedesktop.dbus.Struct; - import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import org.freedesktop.dbus.Struct; + /** * The type of a struct. * Should be used whenever you need a Type variable for a struct. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/types/Variant.java b/federation/sssd/src/main/java/org/freedesktop/dbus/types/Variant.java index f1b632f5d46..6ff42e6d0cb 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/types/Variant.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/types/Variant.java @@ -1,15 +1,15 @@ package org.freedesktop.dbus.types; -import org.freedesktop.dbus.Marshalling; -import org.freedesktop.dbus.exceptions.DBusException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; import java.util.Objects; +import org.freedesktop.dbus.Marshalling; +import org.freedesktop.dbus.exceptions.DBusException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * A Wrapper class for Variant values. * A method on DBus can send or receive a Variant. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/utils/AddressBuilder.java b/federation/sssd/src/main/java/org/freedesktop/dbus/utils/AddressBuilder.java index 2d3f76eee55..eed4a012f1c 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/utils/AddressBuilder.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/utils/AddressBuilder.java @@ -1,14 +1,14 @@ package org.freedesktop.dbus.utils; -import org.freedesktop.dbus.config.DBusSysProps; -import org.freedesktop.dbus.connections.BusAddress; -import org.freedesktop.dbus.exceptions.AddressResolvingException; - import java.io.File; import java.util.Arrays; import java.util.List; import java.util.Properties; +import org.freedesktop.dbus.config.DBusSysProps; +import org.freedesktop.dbus.connections.BusAddress; +import org.freedesktop.dbus.exceptions.AddressResolvingException; + public final class AddressBuilder { /** * @deprecated Constant has been moved to {@link DBusSysProps}. diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/utils/DBusNamingUtil.java b/federation/sssd/src/main/java/org/freedesktop/dbus/utils/DBusNamingUtil.java index 658916ccb7f..a213283e455 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/utils/DBusNamingUtil.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/utils/DBusNamingUtil.java @@ -1,13 +1,13 @@ package org.freedesktop.dbus.utils; -import org.freedesktop.dbus.annotations.DBusInterfaceName; -import org.freedesktop.dbus.annotations.DBusMemberName; - import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.Objects; import java.util.regex.Pattern; +import org.freedesktop.dbus.annotations.DBusInterfaceName; +import org.freedesktop.dbus.annotations.DBusMemberName; + /** * DBus name Util class for internal and external use. */ diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/utils/Util.java b/federation/sssd/src/main/java/org/freedesktop/dbus/utils/Util.java index 2dc1512a177..8251a379156 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/utils/Util.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/utils/Util.java @@ -1,8 +1,5 @@ package org.freedesktop.dbus.utils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -34,6 +31,9 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Utility class providing helper methods for handling strings, files and so on. * diff --git a/federation/sssd/src/main/java/org/freedesktop/dbus/utils/XmlUtil.java b/federation/sssd/src/main/java/org/freedesktop/dbus/utils/XmlUtil.java index 1070a8acc30..6fa2e2e23c5 100644 --- a/federation/sssd/src/main/java/org/freedesktop/dbus/utils/XmlUtil.java +++ b/federation/sssd/src/main/java/org/freedesktop/dbus/utils/XmlUtil.java @@ -1,13 +1,5 @@ package org.freedesktop.dbus.utils; -import org.freedesktop.dbus.utils.XmlErrorHandlers.XmlErrorHandlerQuiet; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.ErrorHandler; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.OutputStream; @@ -17,7 +9,6 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.OutputKeys; @@ -32,6 +23,14 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import org.freedesktop.dbus.utils.XmlErrorHandlers.XmlErrorHandlerQuiet; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.ErrorHandler; + /** * Assorted static XML utility methods. * diff --git a/federation/sssd/src/main/java/org/freedesktop/sssd/infopipe/InfoPipe.java b/federation/sssd/src/main/java/org/freedesktop/sssd/infopipe/InfoPipe.java index aabd4e01d02..d453b6c2b84 100644 --- a/federation/sssd/src/main/java/org/freedesktop/sssd/infopipe/InfoPipe.java +++ b/federation/sssd/src/main/java/org/freedesktop/sssd/infopipe/InfoPipe.java @@ -19,6 +19,7 @@ package org.freedesktop.sssd.infopipe; import java.util.List; import java.util.Map; + import org.freedesktop.dbus.annotations.DBusInterfaceName; import org.freedesktop.dbus.annotations.DBusMemberName; import org.freedesktop.dbus.interfaces.DBusInterface; diff --git a/federation/sssd/src/main/java/org/jvnet/libpam/PAM.java b/federation/sssd/src/main/java/org/jvnet/libpam/PAM.java index cc8761fa62e..09adbac9ce6 100644 --- a/federation/sssd/src/main/java/org/jvnet/libpam/PAM.java +++ b/federation/sssd/src/main/java/org/jvnet/libpam/PAM.java @@ -23,6 +23,8 @@ */ package org.jvnet.libpam; +import java.util.Set; + import com.sun.jna.Pointer; import com.sun.jna.ptr.PointerByReference; import org.jboss.logging.Logger; @@ -33,8 +35,6 @@ import org.jvnet.libpam.impl.PAMLibrary.pam_handle_t; import org.jvnet.libpam.impl.PAMLibrary.pam_message; import org.jvnet.libpam.impl.PAMLibrary.pam_response; -import java.util.Set; - import static com.sun.jna.Native.POINTER_SIZE; import static org.jvnet.libpam.impl.CLibrary.libc; import static org.jvnet.libpam.impl.PAMLibrary.PAM_CONV_ERR; diff --git a/federation/sssd/src/main/java/org/jvnet/libpam/UnixUser.java b/federation/sssd/src/main/java/org/jvnet/libpam/UnixUser.java index bc1ceab8e1a..235d3d1727e 100644 --- a/federation/sssd/src/main/java/org/jvnet/libpam/UnixUser.java +++ b/federation/sssd/src/main/java/org/jvnet/libpam/UnixUser.java @@ -23,15 +23,15 @@ */ package org.jvnet.libpam; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + import com.sun.jna.Memory; import com.sun.jna.ptr.IntByReference; import org.jvnet.libpam.impl.CLibrary.group; import org.jvnet.libpam.impl.CLibrary.passwd; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; - import static org.jvnet.libpam.impl.CLibrary.libc; /** diff --git a/federation/sssd/src/main/java/org/jvnet/libpam/impl/BSDPasswd.java b/federation/sssd/src/main/java/org/jvnet/libpam/impl/BSDPasswd.java index 2e437bb660e..eedf60cf6b4 100644 --- a/federation/sssd/src/main/java/org/jvnet/libpam/impl/BSDPasswd.java +++ b/federation/sssd/src/main/java/org/jvnet/libpam/impl/BSDPasswd.java @@ -24,12 +24,12 @@ package org.jvnet.libpam.impl; -import org.jvnet.libpam.impl.CLibrary.passwd; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.jvnet.libpam.impl.CLibrary.passwd; + /** * FreeeBSD, OpenBSD and MacOS passwd *

diff --git a/federation/sssd/src/main/java/org/jvnet/libpam/impl/CLibrary.java b/federation/sssd/src/main/java/org/jvnet/libpam/impl/CLibrary.java index e3b610536ad..6a2a58d2d48 100644 --- a/federation/sssd/src/main/java/org/jvnet/libpam/impl/CLibrary.java +++ b/federation/sssd/src/main/java/org/jvnet/libpam/impl/CLibrary.java @@ -23,6 +23,9 @@ */ package org.jvnet.libpam.impl; +import java.util.Arrays; +import java.util.List; + import com.sun.jna.Library; import com.sun.jna.Memory; import com.sun.jna.Native; @@ -32,9 +35,6 @@ import com.sun.jna.Structure; import com.sun.jna.ptr.IntByReference; import org.jvnet.libpam.PAMException; -import java.util.Arrays; -import java.util.List; - /** * @author Kohsuke Kawaguchi */ diff --git a/federation/sssd/src/main/java/org/jvnet/libpam/impl/FreeBSDPasswd.java b/federation/sssd/src/main/java/org/jvnet/libpam/impl/FreeBSDPasswd.java index 28e519b5612..8873f341ad4 100644 --- a/federation/sssd/src/main/java/org/jvnet/libpam/impl/FreeBSDPasswd.java +++ b/federation/sssd/src/main/java/org/jvnet/libpam/impl/FreeBSDPasswd.java @@ -24,12 +24,12 @@ package org.jvnet.libpam.impl; -import org.jvnet.libpam.impl.CLibrary.passwd; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.jvnet.libpam.impl.CLibrary.passwd; + /** * FreeeBSD *

diff --git a/federation/sssd/src/main/java/org/jvnet/libpam/impl/LinuxPasswd.java b/federation/sssd/src/main/java/org/jvnet/libpam/impl/LinuxPasswd.java index c1b167877cd..e1ca54b3d77 100644 --- a/federation/sssd/src/main/java/org/jvnet/libpam/impl/LinuxPasswd.java +++ b/federation/sssd/src/main/java/org/jvnet/libpam/impl/LinuxPasswd.java @@ -24,12 +24,12 @@ package org.jvnet.libpam.impl; -import org.jvnet.libpam.impl.CLibrary.passwd; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.jvnet.libpam.impl.CLibrary.passwd; + /** * Linux passwd *

diff --git a/federation/sssd/src/main/java/org/jvnet/libpam/impl/PAMLibrary.java b/federation/sssd/src/main/java/org/jvnet/libpam/impl/PAMLibrary.java index e40eb68af70..19589af22f0 100644 --- a/federation/sssd/src/main/java/org/jvnet/libpam/impl/PAMLibrary.java +++ b/federation/sssd/src/main/java/org/jvnet/libpam/impl/PAMLibrary.java @@ -23,6 +23,9 @@ */ package org.jvnet.libpam.impl; +import java.util.Arrays; +import java.util.List; + import com.sun.jna.Callback; import com.sun.jna.Library; import com.sun.jna.Native; @@ -31,9 +34,6 @@ import com.sun.jna.PointerType; import com.sun.jna.Structure; import com.sun.jna.ptr.PointerByReference; -import java.util.Arrays; -import java.util.List; - import static org.jvnet.libpam.impl.CLibrary.libc; /** diff --git a/federation/sssd/src/main/java/org/jvnet/libpam/impl/SolarisPasswd.java b/federation/sssd/src/main/java/org/jvnet/libpam/impl/SolarisPasswd.java index 37ee7492307..115ea7b2c46 100644 --- a/federation/sssd/src/main/java/org/jvnet/libpam/impl/SolarisPasswd.java +++ b/federation/sssd/src/main/java/org/jvnet/libpam/impl/SolarisPasswd.java @@ -25,12 +25,12 @@ package org.jvnet.libpam.impl; -import org.jvnet.libpam.impl.CLibrary.passwd; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.jvnet.libpam.impl.CLibrary.passwd; + /** * Solaris passwd *

diff --git a/federation/sssd/src/main/java/org/keycloak/federation/sssd/ReadonlySSSDUserModelDelegate.java b/federation/sssd/src/main/java/org/keycloak/federation/sssd/ReadonlySSSDUserModelDelegate.java index 846fb554a95..6332ea01468 100755 --- a/federation/sssd/src/main/java/org/keycloak/federation/sssd/ReadonlySSSDUserModelDelegate.java +++ b/federation/sssd/src/main/java/org/keycloak/federation/sssd/ReadonlySSSDUserModelDelegate.java @@ -17,12 +17,12 @@ package org.keycloak.federation.sssd; +import java.util.List; + import org.keycloak.models.UserModel; import org.keycloak.models.utils.UserModelDelegate; import org.keycloak.storage.ReadOnlyException; -import java.util.List; - /** * Readonly proxy for a SSSD UserModel that prevents attributes from being updated. * diff --git a/federation/sssd/src/main/java/org/keycloak/federation/sssd/SSSDFederationProvider.java b/federation/sssd/src/main/java/org/keycloak/federation/sssd/SSSDFederationProvider.java index 9b16ab06485..a25145ba03c 100755 --- a/federation/sssd/src/main/java/org/keycloak/federation/sssd/SSSDFederationProvider.java +++ b/federation/sssd/src/main/java/org/keycloak/federation/sssd/SSSDFederationProvider.java @@ -17,7 +17,12 @@ package org.keycloak.federation.sssd; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + import org.keycloak.credential.CredentialInput; import org.keycloak.credential.CredentialInputUpdater; import org.keycloak.credential.CredentialInputValidator; @@ -44,11 +49,7 @@ import org.keycloak.userprofile.UserProfileDecorator; import org.keycloak.userprofile.UserProfileMetadata; import org.keycloak.userprofile.UserProfileUtil; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; +import org.jboss.logging.Logger; /** * SPI provider implementation to retrieve data from SSSD and authenticate diff --git a/federation/sssd/src/main/java/org/keycloak/federation/sssd/SSSDFederationProviderFactory.java b/federation/sssd/src/main/java/org/keycloak/federation/sssd/SSSDFederationProviderFactory.java index 7042444f2e1..4ee370f9467 100755 --- a/federation/sssd/src/main/java/org/keycloak/federation/sssd/SSSDFederationProviderFactory.java +++ b/federation/sssd/src/main/java/org/keycloak/federation/sssd/SSSDFederationProviderFactory.java @@ -17,10 +17,6 @@ package org.keycloak.federation.sssd; -import org.freedesktop.dbus.connections.impl.DBusConnection; -import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder; -import org.freedesktop.dbus.exceptions.DBusException; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.component.ComponentModel; import org.keycloak.federation.sssd.impl.AvailabilityChecker; @@ -31,6 +27,11 @@ import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.storage.UserStorageProviderFactory; import org.keycloak.storage.UserStorageProviderModel; +import org.freedesktop.dbus.connections.impl.DBusConnection; +import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder; +import org.freedesktop.dbus.exceptions.DBusException; +import org.jboss.logging.Logger; + /** * @author Bruno Oliveira * @version $Revision: 1 $ diff --git a/federation/sssd/src/main/java/org/keycloak/federation/sssd/api/Sssd.java b/federation/sssd/src/main/java/org/keycloak/federation/sssd/api/Sssd.java index 44fed724ea3..f3997fa7574 100644 --- a/federation/sssd/src/main/java/org/keycloak/federation/sssd/api/Sssd.java +++ b/federation/sssd/src/main/java/org/keycloak/federation/sssd/api/Sssd.java @@ -21,12 +21,13 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import org.keycloak.models.UserModel; + import org.freedesktop.dbus.connections.impl.DBusConnection; import org.freedesktop.dbus.types.DBusListType; import org.freedesktop.dbus.types.Variant; import org.freedesktop.sssd.infopipe.InfoPipe; import org.jboss.logging.Logger; -import org.keycloak.models.UserModel; /** * @author Bruno Oliveira diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java index eb446b7d1ef..d183411e881 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/ClientBuilderWrapper.java @@ -1,6 +1,7 @@ package org.keycloak.admin.client; import javax.net.ssl.SSLContext; + import jakarta.ws.rs.client.ClientBuilder; public class ClientBuilderWrapper { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java index 5125e24708c..e215bd248c5 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/CreatedResponseUtil.java @@ -16,12 +16,13 @@ */ package org.keycloak.admin.client; +import java.net.URI; +import java.util.Map; + import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.Map; /** * A Utility class that parses the Response object into the underlying ID attribute diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/JacksonProvider.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/JacksonProvider.java index ecd5773869b..c74a5a8ae8e 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/JacksonProvider.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/JacksonProvider.java @@ -1,9 +1,9 @@ package org.keycloak.admin.client; -import com.fasterxml.jackson.databind.DeserializationFeature; import jakarta.ws.rs.core.MediaType; import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import org.jboss.resteasy.plugins.providers.jackson.ResteasyJackson2Provider; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java index e8ee622b657..c7cebdf7369 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/Keycloak.java @@ -16,8 +16,15 @@ */ package org.keycloak.admin.client; +import java.net.URI; +import java.util.Iterator; +import java.util.ServiceLoader; +import javax.net.ssl.SSLContext; + +import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientRequestFilter; import jakarta.ws.rs.client.WebTarget; + import org.keycloak.admin.client.resource.BearerAuthFilter; import org.keycloak.admin.client.resource.DPoPAuthFilter; import org.keycloak.admin.client.resource.RealmResource; @@ -26,12 +33,6 @@ import org.keycloak.admin.client.resource.ServerInfoResource; import org.keycloak.admin.client.spi.ResteasyClientProvider; import org.keycloak.admin.client.token.TokenManager; -import javax.net.ssl.SSLContext; -import jakarta.ws.rs.client.Client; -import java.net.URI; -import java.util.Iterator; -import java.util.ServiceLoader; - import static org.keycloak.OAuth2Constants.PASSWORD; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java index 0c6d802e449..e12a939fb94 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/KeycloakBuilder.java @@ -17,10 +17,10 @@ package org.keycloak.admin.client; -import static org.keycloak.OAuth2Constants.PASSWORD; - import jakarta.ws.rs.client.Client; +import static org.keycloak.OAuth2Constants.PASSWORD; + /** * Provides a {@link Keycloak} client builder with the ability to customize the underlying * {@link jakarta.ws.rs.client.Client RESTEasy client} used to communicate with the Keycloak server. diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java index 1aee3f3aa20..f5ba9099221 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AttackDetectionResource.java @@ -17,13 +17,14 @@ package org.keycloak.admin.client.resource; +import java.util.Map; + import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import java.util.Map; /** * @author Stian Thorgersen diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java index 8c354a66ce3..6514484e7d6 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthenticationManagementResource.java @@ -17,16 +17,8 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.AuthenticationExecutionInfoRepresentation; -import org.keycloak.representations.idm.AuthenticationExecutionRepresentation; -import org.keycloak.representations.idm.AuthenticationFlowRepresentation; -import org.keycloak.representations.idm.AuthenticatorConfigInfoRepresentation; -import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; -import org.keycloak.representations.idm.ConfigPropertyRepresentation; -import org.keycloak.representations.idm.RequiredActionConfigInfoRepresentation; -import org.keycloak.representations.idm.RequiredActionConfigRepresentation; -import org.keycloak.representations.idm.RequiredActionProviderRepresentation; -import org.keycloak.representations.idm.RequiredActionProviderSimpleRepresentation; +import java.util.List; +import java.util.Map; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -38,8 +30,17 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Map; + +import org.keycloak.representations.idm.AuthenticationExecutionInfoRepresentation; +import org.keycloak.representations.idm.AuthenticationExecutionRepresentation; +import org.keycloak.representations.idm.AuthenticationFlowRepresentation; +import org.keycloak.representations.idm.AuthenticatorConfigInfoRepresentation; +import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; +import org.keycloak.representations.idm.ConfigPropertyRepresentation; +import org.keycloak.representations.idm.RequiredActionConfigInfoRepresentation; +import org.keycloak.representations.idm.RequiredActionConfigRepresentation; +import org.keycloak.representations.idm.RequiredActionProviderRepresentation; +import org.keycloak.representations.idm.RequiredActionProviderSimpleRepresentation; /** * @author Marko Strukelj diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java index d8398367355..53be6744573 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/AuthorizationResource.java @@ -16,8 +16,6 @@ */ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; @@ -26,6 +24,8 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; + /** * @author Pedro Igor */ diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java index c0b9fd4ed82..e6bd8aeb3ea 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BasicAuthFilter.java @@ -17,11 +17,12 @@ package org.keycloak.admin.client.resource; +import java.io.IOException; +import java.util.Base64; + import jakarta.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestFilter; import jakarta.ws.rs.core.HttpHeaders; -import java.io.IOException; -import java.util.Base64; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java index 5eca4e109a9..91f13eec87d 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/BearerAuthFilter.java @@ -17,15 +17,16 @@ package org.keycloak.admin.client.resource; -import org.keycloak.admin.client.token.TokenManager; +import java.io.IOException; +import java.util.List; import jakarta.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestFilter; import jakarta.ws.rs.client.ClientResponseContext; import jakarta.ws.rs.client.ClientResponseFilter; import jakarta.ws.rs.core.HttpHeaders; -import java.io.IOException; -import java.util.List; + +import org.keycloak.admin.client.token.TokenManager; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java index 4657a9c6327..d3be3a13aeb 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java @@ -17,9 +17,6 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.KeyStoreConfig; -import org.keycloak.representations.idm.CertificateRepresentation; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; @@ -27,6 +24,9 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.keycloak.representations.KeyStoreConfig; +import org.keycloak.representations.idm.CertificateRepresentation; + /** * * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java index 8594d2eebad..f43bbdad174 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientInitialAccessResource.java @@ -17,8 +17,7 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation; -import org.keycloak.representations.idm.ClientInitialAccessPresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -28,7 +27,9 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import java.util.List; + +import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation; +import org.keycloak.representations.idm.ClientInitialAccessPresentation; /** * @author Stian Thorgersen diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java index 7404e0d8285..c99c3fdce19 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientPoliciesPoliciesResource.java @@ -32,4 +32,3 @@ public interface ClientPoliciesPoliciesResource { @Consumes(MediaType.APPLICATION_JSON) void updatePolicies(final ClientPoliciesRepresentation clientPolicies); } - diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java index d649d7abbef..2447dfe97ff 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java @@ -30,8 +30,8 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; - import jakarta.ws.rs.core.Response; + import org.keycloak.representations.adapters.action.GlobalRequestResult; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeEvaluateResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeEvaluateResource.java index c6a33bdaca2..f53799da9d1 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeEvaluateResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeEvaluateResource.java @@ -17,14 +17,15 @@ package org.keycloak.admin.client.resource; +import java.util.Map; + import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.QueryParam; + import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; -import java.util.Map; - /** * @author Giuseppe Graziano */ diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java index 04f7654f217..6f31a1c982c 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java @@ -17,8 +17,6 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.ClientScopeRepresentation; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -27,6 +25,8 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.keycloak.representations.idm.ClientScopeRepresentation; + /** * @author rodrigo.sasaki@icarros.com.br */ diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java index 203525b3c6d..ad2470d1f55 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopesResource.java @@ -17,7 +17,7 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.ClientScopeRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -27,7 +27,8 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.representations.idm.ClientScopeRepresentation; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java index 832ca3f48eb..de055863fa4 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientTypesResource.java @@ -23,6 +23,7 @@ import jakarta.ws.rs.GET; import jakarta.ws.rs.PUT; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; + import org.keycloak.representations.idm.ClientTypesRepresentation; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java index 62e2d6ca638..0262939d727 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java @@ -17,7 +17,7 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.ClientRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -29,7 +29,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.representations.idm.ClientRepresentation; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java index 5346e4faa86..5df86d1ebf8 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java @@ -18,9 +18,6 @@ package org.keycloak.admin.client.resource; import java.util.List; -import org.keycloak.representations.idm.ComponentRepresentation; -import org.keycloak.representations.idm.ComponentTypeRepresentation; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -30,6 +27,9 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; +import org.keycloak.representations.idm.ComponentRepresentation; +import org.keycloak.representations.idm.ComponentTypeRepresentation; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java index 96c630fbc67..ea0a71e5ffb 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java @@ -16,7 +16,7 @@ */ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.ComponentRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -28,7 +28,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.representations.idm.ComponentRepresentation; /** * @author Bill Burke diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/DPoPAuthFilter.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/DPoPAuthFilter.java index badc679112a..0c7a530f681 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/DPoPAuthFilter.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/DPoPAuthFilter.java @@ -21,6 +21,7 @@ import java.io.IOException; import jakarta.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.core.HttpHeaders; + import org.keycloak.admin.client.token.TokenManager; import org.keycloak.util.DPoPGenerator; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java index 950487ea82d..52836e2f1f0 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java @@ -17,10 +17,7 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.GroupRepresentation; -import org.keycloak.representations.idm.ManagementPermissionReference; -import org.keycloak.representations.idm.ManagementPermissionRepresentation; -import org.keycloak.representations.idm.UserRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -32,7 +29,11 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.representations.idm.GroupRepresentation; +import org.keycloak.representations.idm.ManagementPermissionReference; +import org.keycloak.representations.idm.ManagementPermissionRepresentation; +import org.keycloak.representations.idm.UserRepresentation; /** * @author Bill Burke diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java index 1767f1acdad..0f510d767e3 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupsResource.java @@ -17,7 +17,8 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.GroupRepresentation; +import java.util.List; +import java.util.Map; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DefaultValue; @@ -29,8 +30,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Map; + +import org.keycloak.representations.idm.GroupRepresentation; /** * @author Bill Burke diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java index 01c1dccb729..be5dc2a709b 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProviderResource.java @@ -17,9 +17,8 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; -import org.keycloak.representations.idm.IdentityProviderMapperTypeRepresentation; -import org.keycloak.representations.idm.IdentityProviderRepresentation; +import java.util.List; +import java.util.Map; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -32,8 +31,10 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Map; + +import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; +import org.keycloak.representations.idm.IdentityProviderMapperTypeRepresentation; +import org.keycloak.representations.idm.IdentityProviderRepresentation; /** * @author pedroigor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java index 6f7740e4157..3fb0f39c5cd 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/IdentityProvidersResource.java @@ -17,7 +17,8 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.IdentityProviderRepresentation; +import java.util.List; +import java.util.Map; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -28,8 +29,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Map; + +import org.keycloak.representations.idm.IdentityProviderRepresentation; /** * @author pedroigor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java index e972cfefcd1..763bdd7bbd1 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/KeyResource.java @@ -17,12 +17,12 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.KeysMetadataRepresentation; - import jakarta.ws.rs.GET; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.keycloak.representations.idm.KeysMetadataRepresentation; + /** * @author Stian Thorgersen */ diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java index da445779fb2..7b64bb5113f 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProviderResource.java @@ -22,6 +22,7 @@ import jakarta.ws.rs.GET; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.representations.idm.IdentityProviderRepresentation; public interface OrganizationIdentityProviderResource { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java index 7face7de2ad..1ca509ee5b8 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationIdentityProvidersResource.java @@ -27,6 +27,7 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.representations.idm.IdentityProviderRepresentation; public interface OrganizationIdentityProvidersResource { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java index 91a098a0452..b11588eb2b3 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMemberResource.java @@ -27,6 +27,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.representations.idm.MemberRepresentation; import org.keycloak.representations.idm.OrganizationRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java index 89e289cce08..e0790931224 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationMembersResource.java @@ -31,6 +31,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.representations.idm.MemberRepresentation; import org.keycloak.representations.idm.MembershipType; import org.keycloak.representations.idm.OrganizationRepresentation; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java index 7c696739d0c..b2666f24332 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationResource.java @@ -25,6 +25,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.representations.idm.OrganizationRepresentation; public interface OrganizationResource { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsMembersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsMembersResource.java index a71c0273c83..e609bf4d131 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsMembersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsMembersResource.java @@ -26,6 +26,7 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; + import org.keycloak.representations.idm.OrganizationRepresentation; public interface OrganizationsMembersResource { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java index 702d188aa0b..f1b360e3968 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/OrganizationsResource.java @@ -28,6 +28,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.representations.idm.OrganizationRepresentation; /** diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java index b9dace649a9..986367a9869 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/PoliciesResource.java @@ -16,10 +16,7 @@ */ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.authorization.PolicyEvaluationRequest; -import org.keycloak.representations.idm.authorization.PolicyEvaluationResponse; -import org.keycloak.representations.idm.authorization.PolicyProviderRepresentation; -import org.keycloak.representations.idm.authorization.PolicyRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -30,7 +27,11 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.representations.idm.authorization.PolicyEvaluationRequest; +import org.keycloak.representations.idm.authorization.PolicyEvaluationResponse; +import org.keycloak.representations.idm.authorization.PolicyProviderRepresentation; +import org.keycloak.representations.idm.authorization.PolicyRepresentation; /** * @author Pedro Igor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java index ee7bbb0921d..40ec9381553 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java @@ -17,7 +17,7 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.ProtocolMapperRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -28,7 +28,8 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.representations.idm.ProtocolMapperRepresentation; /** * @author Marek Posolda diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java index 583a7afc5e2..159bd766f48 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java @@ -17,21 +17,12 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.adapters.action.GlobalRequestResult; -import org.keycloak.representations.idm.AdminEventRepresentation; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.ClientScopeRepresentation; -import org.keycloak.representations.idm.EventRepresentation; -import org.keycloak.representations.idm.GroupRepresentation; -import org.keycloak.representations.idm.LDAPCapabilityRepresentation; -import org.keycloak.representations.idm.PartialImportRepresentation; -import org.keycloak.representations.idm.RealmEventsConfigRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.representations.idm.TestLdapConnectionRepresentation; +import java.util.List; +import java.util.Map; import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.FormParam; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; @@ -43,8 +34,17 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Map; +import org.keycloak.representations.adapters.action.GlobalRequestResult; +import org.keycloak.representations.idm.AdminEventRepresentation; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.ClientScopeRepresentation; +import org.keycloak.representations.idm.EventRepresentation; +import org.keycloak.representations.idm.GroupRepresentation; +import org.keycloak.representations.idm.LDAPCapabilityRepresentation; +import org.keycloak.representations.idm.PartialImportRepresentation; +import org.keycloak.representations.idm.RealmEventsConfigRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.representations.idm.TestLdapConnectionRepresentation; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java index 9b0adf2d637..d354828b24f 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java @@ -17,7 +17,7 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.RealmRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -26,7 +26,8 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import java.util.List; + +import org.keycloak.representations.idm.RealmRepresentation; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java index 49cd2e2eb99..1ed76865cbd 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceResource.java @@ -18,9 +18,6 @@ package org.keycloak.admin.client.resource; import java.util.List; -import org.keycloak.representations.idm.authorization.PolicyRepresentation; -import org.keycloak.representations.idm.authorization.ResourceRepresentation; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -29,6 +26,9 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.keycloak.representations.idm.authorization.PolicyRepresentation; +import org.keycloak.representations.idm.authorization.ResourceRepresentation; + /** * @author Pedro Igor */ diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java index 276a53eb117..d9afa5d8d19 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopeResource.java @@ -18,9 +18,6 @@ package org.keycloak.admin.client.resource; import java.util.List; -import org.keycloak.representations.idm.authorization.PolicyRepresentation; -import org.keycloak.representations.idm.authorization.ScopeRepresentation; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -29,6 +26,9 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.keycloak.representations.idm.authorization.PolicyRepresentation; +import org.keycloak.representations.idm.authorization.ScopeRepresentation; + /** * @author Pedro Igor */ diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java index 2746e9e2958..55f57a7c4d7 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourceScopesResource.java @@ -16,7 +16,7 @@ */ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.authorization.ScopeRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -27,7 +27,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.representations.idm.authorization.ScopeRepresentation; /** * @author Pedro Igor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java index 0afafa72805..307b9d3e94c 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ResourcesResource.java @@ -16,7 +16,7 @@ */ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.authorization.ResourceRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -27,7 +27,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.representations.idm.authorization.ResourceRepresentation; /** * @author Pedro Igor diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java index 0de55c09853..548e9e36810 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleByIdResource.java @@ -17,7 +17,8 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.RoleRepresentation; +import java.util.List; +import java.util.Set; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -29,8 +30,8 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import java.util.List; -import java.util.Set; + +import org.keycloak.representations.idm.RoleRepresentation; /** * Sometimes its easier to just interact with roles by their ID instead of container/role-name diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java index e25fe13c628..6488230a899 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java @@ -17,8 +17,6 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.MappingsRepresentation; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; @@ -26,6 +24,8 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.keycloak.representations.idm.MappingsRepresentation; + /** * @author rodrigo.sasaki@icarros.com.br */ diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java index 7af6daed28c..e7845fd210d 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleResource.java @@ -17,11 +17,8 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.GroupRepresentation; -import org.keycloak.representations.idm.ManagementPermissionReference; -import org.keycloak.representations.idm.ManagementPermissionRepresentation; -import org.keycloak.representations.idm.RoleRepresentation; -import org.keycloak.representations.idm.UserRepresentation; +import java.util.List; +import java.util.Set; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -33,8 +30,12 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import java.util.List; -import java.util.Set; + +import org.keycloak.representations.idm.GroupRepresentation; +import org.keycloak.representations.idm.ManagementPermissionReference; +import org.keycloak.representations.idm.ManagementPermissionRepresentation; +import org.keycloak.representations.idm.RoleRepresentation; +import org.keycloak.representations.idm.UserRepresentation; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java index 3e59b386c95..97e63a2d62f 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java @@ -17,7 +17,7 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.RoleRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -28,7 +28,8 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import java.util.List; + +import org.keycloak.representations.idm.RoleRepresentation; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java index f76f9ae3548..3d26c6722f9 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RolesResource.java @@ -17,7 +17,7 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.RoleRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -29,7 +29,8 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import java.util.List; + +import org.keycloak.representations.idm.RoleRepresentation; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java index abbb4e92d5b..da38651ecf2 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ServerInfoResource.java @@ -17,13 +17,13 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.info.ServerInfoRepresentation; - import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.keycloak.representations.info.ServerInfoRepresentation; + /** * @author Stian Thorgersen */ diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java index 131433546c1..26340692be3 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java @@ -17,11 +17,8 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.CredentialRepresentation; -import org.keycloak.representations.idm.FederatedIdentityRepresentation; -import org.keycloak.representations.idm.GroupRepresentation; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.representations.idm.UserSessionRepresentation; +import java.util.List; +import java.util.Map; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -35,8 +32,12 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Map; + +import org.keycloak.representations.idm.CredentialRepresentation; +import org.keycloak.representations.idm.FederatedIdentityRepresentation; +import org.keycloak.representations.idm.GroupRepresentation; +import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.representations.idm.UserSessionRepresentation; /** * @author rodrigo.sasaki@icarros.com.br diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java index 8b38dfd9d41..368f20db9f4 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserStorageProviderResource.java @@ -16,8 +16,6 @@ */ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.SynchronizationResultRepresentation; - import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; @@ -25,6 +23,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; +import org.keycloak.representations.idm.SynchronizationResultRepresentation; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java index fc2ea5230a9..477b8e6a1b3 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UsersResource.java @@ -17,7 +17,7 @@ package org.keycloak.admin.client.resource; -import org.keycloak.representations.idm.UserRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -29,7 +29,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.representations.idm.UserRepresentation; public interface UsersResource { diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/WorkflowResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/WorkflowResource.java index 3db610c0f9f..bd80eeefd6d 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/WorkflowResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/WorkflowResource.java @@ -1,7 +1,5 @@ package org.keycloak.admin.client.resource; -import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -12,8 +10,11 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.representations.workflows.WorkflowRepresentation; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; + public interface WorkflowResource { @DELETE diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/WorkflowsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/WorkflowsResource.java index bae9e6867a4..9fa796442c1 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/WorkflowsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/WorkflowsResource.java @@ -2,7 +2,6 @@ package org.keycloak.admin.client.resource; import java.util.List; -import com.fasterxml.jackson.jakarta.rs.yaml.YAMLMediaTypes; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; @@ -12,9 +11,12 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.representations.workflows.WorkflowRepresentation; import org.keycloak.representations.workflows.WorkflowSetRepresentation; +import com.fasterxml.jackson.jakarta.rs.yaml.YAMLMediaTypes; + /** * @since Keycloak server 26.4.0. All the child endpoints are also available since that version

* diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java index 7c69e2e4057..65dedd5e13d 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientClassicProvider.java @@ -18,13 +18,16 @@ package org.keycloak.admin.client.spi; import javax.net.ssl.SSLContext; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.WebTarget; -import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; + import org.keycloak.admin.client.ClientBuilderWrapper; import org.keycloak.admin.client.JacksonProvider; +import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; + /** * An implementation of {@link ResteasyClientProvider} based on RESTEasy classic. */ diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java index 353928640b3..5b697ebb9ba 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/spi/ResteasyClientProvider.java @@ -18,6 +18,7 @@ package org.keycloak.admin.client.spi; import javax.net.ssl.SSLContext; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.WebTarget; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java index 3da81b050b7..6140e1d2770 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenManager.java @@ -19,7 +19,11 @@ package org.keycloak.admin.client.token; import java.security.KeyPair; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; + import org.keycloak.admin.client.Config; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.BasicAuthFilter; @@ -28,10 +32,6 @@ import org.keycloak.common.util.KeyUtils; import org.keycloak.common.util.Time; import org.keycloak.representations.AccessTokenResponse; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.core.Form; - import static org.keycloak.OAuth2Constants.CLIENT_ID; import static org.keycloak.OAuth2Constants.GRANT_TYPE; import static org.keycloak.OAuth2Constants.PASSWORD; diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java index c2f2010b75f..1a0030f00fe 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/token/TokenService.java @@ -17,8 +17,6 @@ package org.keycloak.admin.client.token; -import org.keycloak.representations.AccessTokenResponse; - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; @@ -27,6 +25,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; +import org.keycloak.representations.AccessTokenResponse; + /** * @author rodrigo.sasaki@icarros.com.br */ diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/CmdStdinContext.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/CmdStdinContext.java index 525a4368881..007d6969784 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/CmdStdinContext.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/CmdStdinContext.java @@ -16,13 +16,13 @@ */ package org.keycloak.client.admin.cli; +import java.io.IOException; +import java.util.List; + import org.keycloak.client.cli.common.AttributeOperation; import org.keycloak.client.cli.util.AttributeException; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.List; - import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/ReflectionUtil.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/ReflectionUtil.java index 3a7cede5e8e..ecc1bf50273 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/ReflectionUtil.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/ReflectionUtil.java @@ -16,19 +16,19 @@ */ package org.keycloak.client.admin.cli; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.keycloak.client.cli.common.AttributeKey; +import org.keycloak.client.cli.common.AttributeOperation; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.NullNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; -import org.keycloak.client.cli.common.AttributeKey; -import org.keycloak.client.cli.common.AttributeOperation; - -import java.util.Iterator; -import java.util.List; -import java.util.Map; - import static org.keycloak.client.cli.common.AttributeOperation.Type.SET; import static org.keycloak.client.cli.util.OutputUtil.MAPPER; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/AbstractRequestCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/AbstractRequestCmd.java index 8e4dddcfbd8..35cac8c4a2e 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/AbstractRequestCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/AbstractRequestCmd.java @@ -16,21 +16,6 @@ */ package org.keycloak.client.admin.cli.commands; -import org.apache.http.entity.ContentType; -import org.keycloak.client.admin.cli.CmdStdinContext; -import org.keycloak.client.admin.cli.ReflectionUtil; -import org.keycloak.client.cli.common.AttributeOperation; -import org.keycloak.client.cli.config.ConfigData; -import org.keycloak.client.cli.util.AccessibleBufferOutputStream; -import org.keycloak.client.cli.util.Header; -import org.keycloak.client.cli.util.Headers; -import org.keycloak.client.cli.util.HeadersBody; -import org.keycloak.client.cli.util.HeadersBodyStatus; -import org.keycloak.client.cli.util.HttpUtil; -import org.keycloak.client.cli.util.OutputFormat; -import org.keycloak.client.cli.util.ReturnFields; -import org.keycloak.util.JsonSerialization; - import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -46,9 +31,23 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.keycloak.client.admin.cli.CmdStdinContext; +import org.keycloak.client.admin.cli.ReflectionUtil; +import org.keycloak.client.cli.common.AttributeOperation; +import org.keycloak.client.cli.config.ConfigData; +import org.keycloak.client.cli.util.AccessibleBufferOutputStream; +import org.keycloak.client.cli.util.Header; +import org.keycloak.client.cli.util.Headers; +import org.keycloak.client.cli.util.HeadersBody; +import org.keycloak.client.cli.util.HeadersBodyStatus; +import org.keycloak.client.cli.util.HttpUtil; +import org.keycloak.client.cli.util.OutputFormat; +import org.keycloak.client.cli.util.ReturnFields; +import org.keycloak.util.JsonSerialization; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; - +import org.apache.http.entity.ContentType; import picocli.CommandLine.ArgGroup; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/AddRolesCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/AddRolesCmd.java index 314a22991af..2d73c3fd9b6 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/AddRolesCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/AddRolesCmd.java @@ -16,18 +16,6 @@ */ package org.keycloak.client.admin.cli.commands; -import com.fasterxml.jackson.databind.node.ObjectNode; - -import picocli.CommandLine.Command; -import picocli.CommandLine.Option; - -import org.keycloak.client.admin.cli.operations.ClientOperations; -import org.keycloak.client.admin.cli.operations.GroupOperations; -import org.keycloak.client.admin.cli.operations.RoleOperations; -import org.keycloak.client.admin.cli.operations.LocalSearch; -import org.keycloak.client.admin.cli.operations.UserOperations; -import org.keycloak.client.cli.config.ConfigData; - import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; @@ -35,6 +23,17 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.keycloak.client.admin.cli.operations.ClientOperations; +import org.keycloak.client.admin.cli.operations.GroupOperations; +import org.keycloak.client.admin.cli.operations.LocalSearch; +import org.keycloak.client.admin.cli.operations.RoleOperations; +import org.keycloak.client.admin.cli.operations.UserOperations; +import org.keycloak.client.cli.config.ConfigData; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import picocli.CommandLine.Command; +import picocli.CommandLine.Option; + import static org.keycloak.client.admin.cli.KcAdmMain.CMD; import static org.keycloak.client.cli.util.ConfigUtil.credentialsAvailable; import static org.keycloak.client.cli.util.ConfigUtil.loadConfig; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/ConfigCredentialsCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/ConfigCredentialsCmd.java index e988a5f63c0..1a877989e83 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/ConfigCredentialsCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/ConfigCredentialsCmd.java @@ -18,12 +18,13 @@ package org.keycloak.client.admin.cli.commands; import org.keycloak.client.admin.cli.KcAdmMain; import org.keycloak.client.cli.common.BaseConfigCredentialsCmd; - import org.keycloak.client.cli.config.ConfigData; + import picocli.CommandLine; import picocli.CommandLine.Command; import static java.lang.System.currentTimeMillis; + import static org.keycloak.client.cli.util.AuthUtil.AUTH_BUFFER_TIME; import static org.keycloak.client.cli.util.ConfigUtil.credentialsAvailable; import static org.keycloak.client.cli.util.ConfigUtil.loadConfig; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/GetRolesCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/GetRolesCmd.java index 6716c9908ce..23972fdc46f 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/GetRolesCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/GetRolesCmd.java @@ -16,15 +16,15 @@ */ package org.keycloak.client.admin.cli.commands; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.keycloak.client.admin.cli.operations.ClientOperations; import org.keycloak.client.admin.cli.operations.GroupOperations; import org.keycloak.client.admin.cli.operations.RoleOperations; import org.keycloak.client.admin.cli.operations.UserOperations; import org.keycloak.client.cli.config.ConfigData; -import java.io.PrintWriter; -import java.io.StringWriter; - import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/GlobalOptionsCmdHelper.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/GlobalOptionsCmdHelper.java index 9ee04b41c34..71507691a4e 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/GlobalOptionsCmdHelper.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/GlobalOptionsCmdHelper.java @@ -16,11 +16,11 @@ */ package org.keycloak.client.admin.cli.commands; +import java.io.IOException; + import org.keycloak.client.cli.util.FilterUtil; import org.keycloak.client.cli.util.ReturnFields; -import java.io.IOException; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/KcAdmCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/KcAdmCmd.java index a5411cc9959..5cd63cad427 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/KcAdmCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/KcAdmCmd.java @@ -16,12 +16,12 @@ */ package org.keycloak.client.admin.cli.commands; -import org.keycloak.client.admin.cli.KcAdmMain; -import org.keycloak.client.cli.common.BaseGlobalOptionsCmd; - import java.io.PrintWriter; import java.io.StringWriter; +import org.keycloak.client.admin.cli.KcAdmMain; +import org.keycloak.client.cli.common.BaseGlobalOptionsCmd; + import picocli.CommandLine; import picocli.CommandLine.Command; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/NewObjectCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/NewObjectCmd.java index 2ca8f0d040d..2a1b47b4883 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/NewObjectCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/NewObjectCmd.java @@ -16,16 +16,6 @@ */ package org.keycloak.client.admin.cli.commands; -import com.fasterxml.jackson.databind.JsonNode; - -import picocli.CommandLine.Command; -import picocli.CommandLine.Option; - -import org.keycloak.client.admin.cli.CmdStdinContext; -import org.keycloak.client.cli.common.AttributeOperation; -import org.keycloak.client.cli.common.BaseGlobalOptionsCmd; -import org.keycloak.client.cli.util.AccessibleBufferOutputStream; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -36,6 +26,16 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import org.keycloak.client.admin.cli.CmdStdinContext; +import org.keycloak.client.cli.common.AttributeOperation; +import org.keycloak.client.cli.common.BaseGlobalOptionsCmd; +import org.keycloak.client.cli.util.AccessibleBufferOutputStream; + +import com.fasterxml.jackson.databind.JsonNode; +import picocli.CommandLine.Command; +import picocli.CommandLine.Option; + +import static org.keycloak.client.admin.cli.KcAdmMain.CMD; import static org.keycloak.client.cli.common.AttributeOperation.Type.SET; import static org.keycloak.client.cli.util.IoUtil.copyStream; import static org.keycloak.client.cli.util.IoUtil.printErr; @@ -43,7 +43,6 @@ import static org.keycloak.client.cli.util.OsUtil.OS_ARCH; import static org.keycloak.client.cli.util.OsUtil.PROMPT; import static org.keycloak.client.cli.util.OutputUtil.MAPPER; import static org.keycloak.client.cli.util.ParseUtil.parseKeyVal; -import static org.keycloak.client.admin.cli.KcAdmMain.CMD; /** * @author Marko Strukelj diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/RemoveRolesCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/RemoveRolesCmd.java index 992a9226e89..0f27d232c88 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/RemoveRolesCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/RemoveRolesCmd.java @@ -16,13 +16,6 @@ */ package org.keycloak.client.admin.cli.commands; -import org.keycloak.client.admin.cli.operations.ClientOperations; -import org.keycloak.client.admin.cli.operations.GroupOperations; -import org.keycloak.client.admin.cli.operations.LocalSearch; -import org.keycloak.client.admin.cli.operations.RoleOperations; -import org.keycloak.client.admin.cli.operations.UserOperations; -import org.keycloak.client.cli.config.ConfigData; - import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; @@ -30,8 +23,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.fasterxml.jackson.databind.node.ObjectNode; +import org.keycloak.client.admin.cli.operations.ClientOperations; +import org.keycloak.client.admin.cli.operations.GroupOperations; +import org.keycloak.client.admin.cli.operations.LocalSearch; +import org.keycloak.client.admin.cli.operations.RoleOperations; +import org.keycloak.client.admin.cli.operations.UserOperations; +import org.keycloak.client.cli.config.ConfigData; +import com.fasterxml.jackson.databind.node.ObjectNode; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/SetPasswordCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/SetPasswordCmd.java index 9a72ddcf01e..59bf7323b15 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/SetPasswordCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/commands/SetPasswordCmd.java @@ -16,20 +16,20 @@ */ package org.keycloak.client.admin.cli.commands; -import org.keycloak.client.cli.config.ConfigData; - import java.io.PrintWriter; import java.io.StringWriter; +import org.keycloak.client.cli.config.ConfigData; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; +import static org.keycloak.client.admin.cli.KcAdmMain.CMD; import static org.keycloak.client.admin.cli.operations.UserOperations.getIdFromUsername; import static org.keycloak.client.admin.cli.operations.UserOperations.resetUserPassword; import static org.keycloak.client.cli.util.ConfigUtil.credentialsAvailable; import static org.keycloak.client.cli.util.ConfigUtil.loadConfig; import static org.keycloak.client.cli.util.OsUtil.PROMPT; -import static org.keycloak.client.admin.cli.KcAdmMain.CMD; import static org.keycloak.common.util.IoUtils.readPasswordFromConsole; /** diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/LocalSearch.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/LocalSearch.java index c91bb955981..e456052b865 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/LocalSearch.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/LocalSearch.java @@ -16,12 +16,12 @@ */ package org.keycloak.client.admin.cli.operations; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; - import java.util.LinkedList; import java.util.List; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; + /** * @author Marko Strukelj */ diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/OperationUtils.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/OperationUtils.java index 15245c565bc..394666a8a24 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/OperationUtils.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/OperationUtils.java @@ -17,11 +17,11 @@ package org.keycloak.client.admin.cli.operations; -import org.keycloak.client.cli.util.HttpUtil; - import java.util.List; import java.util.function.Supplier; +import org.keycloak.client.cli.util.HttpUtil; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/RoleOperations.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/RoleOperations.java index c49e361e29c..5766af20890 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/RoleOperations.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/RoleOperations.java @@ -16,6 +16,11 @@ */ package org.keycloak.client.admin.cli.operations; +import java.util.ArrayList; +import java.util.List; + +import org.keycloak.representations.idm.RoleRepresentation; + import com.fasterxml.jackson.databind.node.ObjectNode; import static org.keycloak.client.cli.util.HttpUtil.composeResourceUrl; @@ -23,11 +28,6 @@ import static org.keycloak.client.cli.util.HttpUtil.doDeleteJSON; import static org.keycloak.client.cli.util.HttpUtil.doGetJSON; import static org.keycloak.client.cli.util.HttpUtil.doPostJSON; -import org.keycloak.representations.idm.RoleRepresentation; - -import java.util.ArrayList; -import java.util.List; - /** * @author Marko Strukelj */ diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/UserOperations.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/UserOperations.java index 1e9c8fbd072..96db5dcf17b 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/UserOperations.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/admin/cli/operations/UserOperations.java @@ -16,6 +16,10 @@ */ package org.keycloak.client.admin.cli.operations; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.List; + import org.keycloak.client.cli.util.Headers; import org.keycloak.client.cli.util.HeadersBody; import org.keycloak.client.cli.util.HeadersBodyStatus; @@ -23,10 +27,6 @@ import org.keycloak.client.cli.util.HttpUtil; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.List; - import static org.keycloak.client.cli.util.HttpUtil.composeResourceUrl; import static org.keycloak.client.cli.util.HttpUtil.doDeleteJSON; import static org.keycloak.client.cli.util.HttpUtil.doPostJSON; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/BaseAuthOptionsCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/BaseAuthOptionsCmd.java index 5e66e312e99..3bbd069768f 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/BaseAuthOptionsCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/BaseAuthOptionsCmd.java @@ -16,6 +16,9 @@ */ package org.keycloak.client.cli.common; +import java.io.File; +import java.io.PrintWriter; + import org.keycloak.OAuth2Constants; import org.keycloak.client.cli.config.ConfigData; import org.keycloak.client.cli.config.ConfigHandler; @@ -27,9 +30,6 @@ import org.keycloak.client.cli.util.ConfigUtil; import org.keycloak.client.cli.util.HttpUtil; import org.keycloak.common.util.IoUtils; -import java.io.File; -import java.io.PrintWriter; - import picocli.CommandLine.Option; import static org.keycloak.client.cli.config.FileConfigHandler.setConfigFile; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/BaseConfigCredentialsCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/BaseConfigCredentialsCmd.java index 6cf9fba900a..c88dab97186 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/BaseConfigCredentialsCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/BaseConfigCredentialsCmd.java @@ -16,17 +16,17 @@ */ package org.keycloak.client.cli.common; +import java.io.File; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.net.URL; + import org.keycloak.OAuth2Constants; import org.keycloak.client.cli.config.ConfigData; import org.keycloak.client.cli.config.RealmConfigData; import org.keycloak.client.cli.util.AuthUtil; import org.keycloak.representations.AccessTokenResponse; -import java.io.File; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.net.URL; - import static org.keycloak.client.cli.util.AuthUtil.getAuthTokens; import static org.keycloak.client.cli.util.AuthUtil.getAuthTokensByJWT; import static org.keycloak.client.cli.util.AuthUtil.getAuthTokensBySecret; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/Globals.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/Globals.java index 71e2d450f36..867c7171c1e 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/Globals.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/common/Globals.java @@ -16,11 +16,11 @@ */ package org.keycloak.client.cli.common; +import java.io.PrintWriter; + import org.keycloak.client.cli.util.ClassLoaderUtil; import org.keycloak.common.crypto.CryptoIntegration; -import java.io.PrintWriter; - import picocli.CommandLine; import picocli.CommandLine.Model.CommandSpec; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/ConfigData.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/ConfigData.java index f67c7fcc84f..6bdb6597082 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/ConfigData.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/ConfigData.java @@ -16,13 +16,14 @@ */ package org.keycloak.client.cli.config; -import com.fasterxml.jackson.annotation.JsonIgnore; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.annotation.JsonIgnore; + /** * @author Marko Strukelj */ diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/FileConfigHandler.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/FileConfigHandler.java index a7eb461984f..24da2821ec1 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/FileConfigHandler.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/FileConfigHandler.java @@ -16,9 +16,6 @@ */ package org.keycloak.client.cli.config; -import org.keycloak.client.cli.util.IoUtil; -import org.keycloak.util.JsonSerialization; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -30,6 +27,9 @@ import java.nio.channels.OverlappingFileLockException; import java.nio.file.Path; import java.nio.file.Paths; +import org.keycloak.client.cli.util.IoUtil; +import org.keycloak.util.JsonSerialization; + import static org.keycloak.client.cli.util.IoUtil.printErr; /** diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/RealmConfigData.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/RealmConfigData.java index fdffa42e56d..c7209e2a43c 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/RealmConfigData.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/config/RealmConfigData.java @@ -16,12 +16,12 @@ */ package org.keycloak.client.cli.config; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.util.LinkedHashMap; import java.util.Map; +import org.keycloak.util.JsonSerialization; + import com.fasterxml.jackson.annotation.JsonInclude; /** diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/AuthUtil.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/AuthUtil.java index 68111b077a6..c2da392c04a 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/AuthUtil.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/AuthUtil.java @@ -16,6 +16,11 @@ */ package org.keycloak.client.cli.util; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.security.KeyPair; + import org.keycloak.client.cli.config.ConfigData; import org.keycloak.client.cli.config.RealmConfigData; import org.keycloak.common.util.KeystoreUtil; @@ -27,12 +32,8 @@ import org.keycloak.representations.JsonWebToken; import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.security.KeyPair; - import static java.lang.System.currentTimeMillis; + import static org.keycloak.client.cli.util.ConfigUtil.checkServerInfo; import static org.keycloak.client.cli.util.ConfigUtil.saveMergeConfig; import static org.keycloak.client.cli.util.HttpUtil.APPLICATION_FORM_URL_ENCODED; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/FilterUtil.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/FilterUtil.java index 6dcf85ae1d2..9a711e55858 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/FilterUtil.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/FilterUtil.java @@ -16,6 +16,9 @@ */ package org.keycloak.client.cli.util; +import java.io.IOException; +import java.util.Iterator; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -23,9 +26,6 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import static org.keycloak.client.cli.util.OutputUtil.MAPPER; import static org.keycloak.client.cli.util.OutputUtil.convertToJsonNode; -import java.io.IOException; -import java.util.Iterator; - /** * @author Marko Strukelj */ diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/Headers.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/Headers.java index 7a9b16ed28f..ce80ff70aa1 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/Headers.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/Headers.java @@ -16,12 +16,12 @@ */ package org.keycloak.client.cli.util; -import org.apache.http.entity.ContentType; - import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Optional; +import org.apache.http.entity.ContentType; + /** * @author Marko Strukelj */ diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HeadersBody.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HeadersBody.java index e11417de3df..25128e3475f 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HeadersBody.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HeadersBody.java @@ -16,12 +16,12 @@ */ package org.keycloak.client.cli.util; -import org.apache.http.entity.ContentType; - import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.nio.charset.Charset; +import org.apache.http.entity.ContentType; + import static org.keycloak.client.cli.util.IoUtil.copyStream; /** diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HeadersBodyStatus.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HeadersBodyStatus.java index 8e82aac079e..b686b1fb9fa 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HeadersBodyStatus.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HeadersBodyStatus.java @@ -16,11 +16,11 @@ */ package org.keycloak.client.cli.util; -import org.keycloak.util.JsonSerialization; - import java.io.InputStream; import java.util.Map; +import org.keycloak.util.JsonSerialization; + /** * @author Marko Strukelj */ diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HttpDelete.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HttpDelete.java index fd9a65a371d..1bd13f85048 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HttpDelete.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HttpDelete.java @@ -16,12 +16,12 @@ */ package org.keycloak.client.cli.util; +import java.net.URI; + import org.apache.http.annotation.Contract; import org.apache.http.annotation.ThreadingBehavior; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; -import java.net.URI; - /** * @author Marko Strukelj */ diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HttpUtil.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HttpUtil.java index 6d81aea2fab..bf26419f152 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HttpUtil.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/HttpUtil.java @@ -16,6 +16,25 @@ */ package org.keycloak.client.cli.util; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; +import java.net.URLEncoder; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicBoolean; +import javax.net.ssl.SSLContext; + +import org.keycloak.util.JsonSerialization; + import org.apache.http.HeaderIterator; import org.apache.http.HttpHeaders; import org.apache.http.HttpResponse; @@ -34,24 +53,6 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.ssl.SSLContextBuilder; import org.apache.http.ssl.SSLContexts; -import org.keycloak.util.JsonSerialization; - -import javax.net.ssl.SSLContext; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.net.HttpURLConnection; -import java.net.URLEncoder; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicBoolean; /** * @author Marko Strukelj diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/IoUtil.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/IoUtil.java index cc1a39a9eea..ab277363420 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/IoUtil.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/IoUtil.java @@ -16,8 +16,6 @@ */ package org.keycloak.client.cli.util; -import org.keycloak.common.util.StreamUtil; - import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; @@ -40,6 +38,8 @@ import java.util.List; import java.util.ListIterator; import java.util.Set; +import org.keycloak.common.util.StreamUtil; + import static java.nio.file.Files.createDirectories; import static java.nio.file.Files.createFile; import static java.nio.file.Files.isDirectory; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/OutputUtil.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/OutputUtil.java index 50a9c0740ae..e53c33ec222 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/OutputUtil.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/cli/util/OutputUtil.java @@ -16,6 +16,11 @@ */ package org.keycloak.client.cli.util; +import java.io.IOException; +import java.util.Iterator; +import java.util.Map; +import java.util.function.Consumer; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; @@ -24,11 +29,6 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.TextNode; -import java.io.IOException; -import java.util.Iterator; -import java.util.Map; -import java.util.function.Consumer; - /** * @author Marko Strukelj */ diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/CmdStdinContext.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/CmdStdinContext.java index 4ed3b4cd2a7..183409dc812 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/CmdStdinContext.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/CmdStdinContext.java @@ -17,15 +17,15 @@ package org.keycloak.client.registration.cli; +import java.io.IOException; +import java.util.List; + import org.keycloak.client.cli.common.AttributeOperation; import org.keycloak.client.cli.util.AttributeException; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.List; - import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/EndpointType.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/EndpointType.java index 698777f8db3..f69283533a9 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/EndpointType.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/EndpointType.java @@ -17,12 +17,12 @@ package org.keycloak.client.registration.cli; -import org.keycloak.client.cli.util.HttpUtil; - import java.util.Arrays; import java.util.HashSet; import java.util.Set; +import org.keycloak.client.cli.util.HttpUtil; + /** * @author Marko Strukelj */ diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/ReflectionUtil.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/ReflectionUtil.java index 24a47bf505d..b2bdec67fb5 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/ReflectionUtil.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/ReflectionUtil.java @@ -17,13 +17,6 @@ package org.keycloak.client.registration.cli; -import com.fasterxml.jackson.core.JsonParseException; - -import org.keycloak.client.cli.common.AttributeKey; -import org.keycloak.client.cli.common.AttributeOperation; -import org.keycloak.client.cli.util.AttributeException; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; @@ -36,6 +29,13 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.keycloak.client.cli.common.AttributeKey; +import org.keycloak.client.cli.common.AttributeOperation; +import org.keycloak.client.cli.util.AttributeException; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.JsonParseException; + /** * @author Marko Strukelj */ diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/AttrsCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/AttrsCmd.java index 5362a1ba164..c1d6120e868 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/AttrsCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/AttrsCmd.java @@ -1,12 +1,5 @@ package org.keycloak.client.registration.cli.commands; -import org.keycloak.client.cli.common.AttributeKey; -import org.keycloak.client.cli.common.BaseGlobalOptionsCmd; -import org.keycloak.client.registration.cli.EndpointType; -import org.keycloak.client.registration.cli.ReflectionUtil; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.oidc.OIDCClientRepresentation; - import java.io.PrintStream; import java.io.PrintWriter; import java.io.StringWriter; @@ -16,6 +9,13 @@ import java.lang.reflect.Type; import java.util.LinkedHashMap; import java.util.Map; +import org.keycloak.client.cli.common.AttributeKey; +import org.keycloak.client.cli.common.BaseGlobalOptionsCmd; +import org.keycloak.client.registration.cli.EndpointType; +import org.keycloak.client.registration.cli.ReflectionUtil; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.oidc.OIDCClientRepresentation; + import picocli.CommandLine; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigInitialTokenCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigInitialTokenCmd.java index d2d22898c25..45e6e4062c4 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigInitialTokenCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigInitialTokenCmd.java @@ -1,13 +1,13 @@ package org.keycloak.client.registration.cli.commands; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.keycloak.client.cli.config.RealmConfigData; import org.keycloak.client.registration.cli.CmdStdinContext; import org.keycloak.client.registration.cli.KcRegMain; import org.keycloak.common.util.IoUtils; -import java.io.PrintWriter; -import java.io.StringWriter; - import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigRegistrationTokenCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigRegistrationTokenCmd.java index 41a11e7253e..7ce64ae8a0d 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigRegistrationTokenCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/ConfigRegistrationTokenCmd.java @@ -1,12 +1,12 @@ package org.keycloak.client.registration.cli.commands; -import org.keycloak.client.registration.cli.KcRegMain; -import org.keycloak.common.util.IoUtils; -import org.keycloak.client.cli.config.RealmConfigData; - import java.io.PrintWriter; import java.io.StringWriter; +import org.keycloak.client.cli.config.RealmConfigData; +import org.keycloak.client.registration.cli.KcRegMain; +import org.keycloak.common.util.IoUtils; + import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/CreateCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/CreateCmd.java index 4212c0d4692..0e6aebae158 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/CreateCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/CreateCmd.java @@ -17,16 +17,6 @@ package org.keycloak.client.registration.cli.commands; -import org.keycloak.client.registration.cli.CmdStdinContext; -import org.keycloak.client.registration.cli.EndpointType; -import org.keycloak.client.registration.cli.EndpointTypeConverter; -import org.keycloak.client.cli.common.AttributeOperation; -import org.keycloak.client.cli.config.ConfigData; -import org.keycloak.client.cli.util.HttpUtil; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.oidc.OIDCClientRepresentation; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; @@ -34,8 +24,17 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.List; -import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; +import org.keycloak.client.cli.common.AttributeOperation; +import org.keycloak.client.cli.config.ConfigData; +import org.keycloak.client.cli.util.HttpUtil; +import org.keycloak.client.registration.cli.CmdStdinContext; +import org.keycloak.client.registration.cli.EndpointType; +import org.keycloak.client.registration.cli.EndpointTypeConverter; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.oidc.OIDCClientRepresentation; +import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/DeleteCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/DeleteCmd.java index 920d529d756..1bf67bf021c 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/DeleteCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/DeleteCmd.java @@ -17,12 +17,12 @@ package org.keycloak.client.registration.cli.commands; -import org.keycloak.client.cli.config.ConfigData; -import org.keycloak.client.registration.cli.CmdStdinContext; - import java.io.PrintWriter; import java.io.StringWriter; +import org.keycloak.client.cli.config.ConfigData; +import org.keycloak.client.registration.cli.CmdStdinContext; + import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/GetCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/GetCmd.java index 333dc614083..9d16ea40850 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/GetCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/GetCmd.java @@ -17,6 +17,11 @@ package org.keycloak.client.registration.cli.commands; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.io.StringWriter; + import org.keycloak.client.cli.config.ConfigData; import org.keycloak.client.registration.cli.CmdStdinContext; import org.keycloak.client.registration.cli.EndpointType; @@ -25,11 +30,6 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.io.StringWriter; - import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.Parameters; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/KcRegCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/KcRegCmd.java index 8e43fbc4791..61a884b49d9 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/KcRegCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/KcRegCmd.java @@ -16,12 +16,12 @@ */ package org.keycloak.client.registration.cli.commands; -import org.keycloak.client.cli.common.BaseGlobalOptionsCmd; -import org.keycloak.client.registration.cli.KcRegMain; - import java.io.PrintWriter; import java.io.StringWriter; +import org.keycloak.client.cli.common.BaseGlobalOptionsCmd; +import org.keycloak.client.registration.cli.KcRegMain; + import picocli.CommandLine.Command; import static org.keycloak.client.cli.util.OsUtil.PROMPT; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/UpdateCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/UpdateCmd.java index ff20171a7de..bbcf100ffb0 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/UpdateCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/UpdateCmd.java @@ -17,23 +17,6 @@ package org.keycloak.client.registration.cli.commands; -import com.fasterxml.jackson.core.JsonParseException; - -import picocli.CommandLine.ArgGroup; -import picocli.CommandLine.Command; -import picocli.CommandLine.Option; -import picocli.CommandLine.Parameters; - -import org.keycloak.client.registration.cli.CmdStdinContext; -import org.keycloak.client.registration.cli.EndpointType; -import org.keycloak.client.registration.cli.EndpointTypeConverter; -import org.keycloak.client.registration.cli.ReflectionUtil; -import org.keycloak.client.cli.common.AttributeOperation; -import org.keycloak.client.cli.config.ConfigData; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.oidc.OIDCClientRepresentation; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; @@ -42,6 +25,22 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; +import org.keycloak.client.cli.common.AttributeOperation; +import org.keycloak.client.cli.config.ConfigData; +import org.keycloak.client.registration.cli.CmdStdinContext; +import org.keycloak.client.registration.cli.EndpointType; +import org.keycloak.client.registration.cli.EndpointTypeConverter; +import org.keycloak.client.registration.cli.ReflectionUtil; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.oidc.OIDCClientRepresentation; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.JsonParseException; +import picocli.CommandLine.ArgGroup; +import picocli.CommandLine.Command; +import picocli.CommandLine.Option; +import picocli.CommandLine.Parameters; + import static org.keycloak.client.cli.common.AttributeOperation.Type.DELETE; import static org.keycloak.client.cli.common.AttributeOperation.Type.SET; import static org.keycloak.client.cli.util.ConfigUtil.credentialsAvailable; diff --git a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/UpdateTokenCmd.java b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/UpdateTokenCmd.java index c66fcab22b4..6a0d33603dd 100644 --- a/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/UpdateTokenCmd.java +++ b/integration/client-cli/admin-cli/src/main/java/org/keycloak/client/registration/cli/commands/UpdateTokenCmd.java @@ -17,21 +17,20 @@ package org.keycloak.client.registration.cli.commands; -import com.fasterxml.jackson.core.type.TypeReference; - -import picocli.CommandLine.Command; -import picocli.CommandLine.Parameters; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.List; import org.keycloak.client.cli.config.ConfigData; import org.keycloak.client.registration.cli.CmdStdinContext; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.List; +import com.fasterxml.jackson.core.type.TypeReference; +import picocli.CommandLine.Command; +import picocli.CommandLine.Parameters; import static org.keycloak.client.cli.util.ConfigUtil.loadConfig; import static org.keycloak.client.cli.util.ConfigUtil.saveMergeConfig; diff --git a/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/admin/cli/ReflectionUtilTest.java b/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/admin/cli/ReflectionUtilTest.java index 0ffd561db37..7d8718fac85 100644 --- a/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/admin/cli/ReflectionUtilTest.java +++ b/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/admin/cli/ReflectionUtilTest.java @@ -17,11 +17,10 @@ package org.keycloak.client.admin.cli; -import org.junit.Test; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.NumericNode; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/admin/cli/commands/KcAdmCliTest.java b/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/admin/cli/commands/KcAdmCliTest.java index 39c161c2841..d0131b170bf 100644 --- a/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/admin/cli/commands/KcAdmCliTest.java +++ b/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/admin/cli/commands/KcAdmCliTest.java @@ -1,15 +1,15 @@ package org.keycloak.client.admin.cli.commands; -import static org.junit.Assert.assertEquals; - import java.io.ByteArrayOutputStream; import java.io.PrintWriter; -import org.junit.Test; import org.keycloak.client.cli.common.Globals; +import org.junit.Test; import picocli.CommandLine; +import static org.junit.Assert.assertEquals; + public class KcAdmCliTest { @Test diff --git a/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/cli/util/MergeAttributesTest.java b/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/cli/util/MergeAttributesTest.java index ab36853228d..6c5179f0a8b 100644 --- a/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/cli/util/MergeAttributesTest.java +++ b/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/cli/util/MergeAttributesTest.java @@ -16,16 +16,17 @@ */ package org.keycloak.client.cli.util; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.junit.Test; +import java.nio.charset.StandardCharsets; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.client.admin.cli.CmdStdinContext; import org.keycloak.client.admin.cli.ReflectionUtil; import org.keycloak.client.cli.common.AttributeOperation; -import java.nio.charset.StandardCharsets; -import java.util.LinkedList; -import java.util.List; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.Test; import static org.keycloak.client.cli.common.AttributeOperation.Type.DELETE; import static org.keycloak.client.cli.common.AttributeOperation.Type.SET; diff --git a/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/cli/util/OuputUtilTest.java b/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/cli/util/OuputUtilTest.java index eac908c4423..0ca1a478ab1 100644 --- a/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/cli/util/OuputUtilTest.java +++ b/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/cli/util/OuputUtilTest.java @@ -17,14 +17,13 @@ package org.keycloak.client.cli.util; -import org.junit.Test; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import com.fasterxml.jackson.databind.JsonNode; +import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/registration/cli/ReflectionUtilTest.java b/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/registration/cli/ReflectionUtilTest.java index a1391db6640..14099086a97 100644 --- a/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/registration/cli/ReflectionUtilTest.java +++ b/integration/client-cli/admin-cli/src/test/java/org/keycloak/client/registration/cli/ReflectionUtilTest.java @@ -1,12 +1,5 @@ package org.keycloak.client.registration.cli; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; -import org.keycloak.client.cli.common.AttributeKey; -import org.keycloak.client.cli.common.AttributeOperation; -import org.keycloak.client.cli.common.AttributeKey.Component; - import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -18,6 +11,14 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.keycloak.client.cli.common.AttributeKey; +import org.keycloak.client.cli.common.AttributeKey.Component; +import org.keycloak.client.cli.common.AttributeOperation; + +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + import static org.keycloak.client.cli.common.AttributeOperation.Type.DELETE; import static org.keycloak.client.cli.common.AttributeOperation.Type.SET; diff --git a/integration/client-registration/src/main/java/org/keycloak/client/registration/Auth.java b/integration/client-registration/src/main/java/org/keycloak/client/registration/Auth.java index 877424591f5..4561821eb41 100644 --- a/integration/client-registration/src/main/java/org/keycloak/client/registration/Auth.java +++ b/integration/client-registration/src/main/java/org/keycloak/client/registration/Auth.java @@ -18,12 +18,14 @@ package org.keycloak.client.registration; import java.util.Base64; -import org.apache.http.HttpHeaders; -import org.apache.http.HttpRequest; + import org.keycloak.representations.idm.ClientInitialAccessPresentation; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; +import org.apache.http.HttpHeaders; +import org.apache.http.HttpRequest; + /** * @author Stian Thorgersen */ diff --git a/integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRegistration.java b/integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRegistration.java index 15fe4b9fba6..c1233a7bf7e 100644 --- a/integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRegistration.java +++ b/integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRegistration.java @@ -17,13 +17,9 @@ package org.keycloak.client.registration; -import static java.nio.charset.StandardCharsets.UTF_8; - import java.io.IOException; import java.io.InputStream; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.HttpClients; import org.keycloak.representations.adapters.config.AdapterConfig; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; @@ -31,6 +27,10 @@ import org.keycloak.util.JsonSerialization; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.http.client.HttpClient; +import org.apache.http.impl.client.HttpClients; + +import static java.nio.charset.StandardCharsets.UTF_8; /** * @author Stian Thorgersen diff --git a/integration/client-registration/src/main/java/org/keycloak/client/registration/HttpErrorException.java b/integration/client-registration/src/main/java/org/keycloak/client/registration/HttpErrorException.java index 640bc0d4a37..3988ca44315 100644 --- a/integration/client-registration/src/main/java/org/keycloak/client/registration/HttpErrorException.java +++ b/integration/client-registration/src/main/java/org/keycloak/client/registration/HttpErrorException.java @@ -17,11 +17,12 @@ package org.keycloak.client.registration; -import org.apache.http.StatusLine; +import java.io.IOException; + import org.keycloak.representations.idm.OAuth2ErrorRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.IOException; +import org.apache.http.StatusLine; /** * @author Stian Thorgersen diff --git a/integration/client-registration/src/main/java/org/keycloak/client/registration/HttpUtil.java b/integration/client-registration/src/main/java/org/keycloak/client/registration/HttpUtil.java index f6e65e629e0..56bc026ea3c 100644 --- a/integration/client-registration/src/main/java/org/keycloak/client/registration/HttpUtil.java +++ b/integration/client-registration/src/main/java/org/keycloak/client/registration/HttpUtil.java @@ -17,6 +17,12 @@ package org.keycloak.client.registration; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.Charset; + +import org.keycloak.common.util.StreamUtil; + import org.apache.http.HttpHeaders; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -27,11 +33,6 @@ import org.apache.http.client.methods.HttpPut; import org.apache.http.client.methods.HttpRequestBase; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; -import org.keycloak.common.util.StreamUtil; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.Charset; /** * @author Stian Thorgersen diff --git a/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/MessagePropertiesFilter.java b/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/MessagePropertiesFilter.java index 4e4c9fa5d8b..4388dad9f49 100644 --- a/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/MessagePropertiesFilter.java +++ b/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/MessagePropertiesFilter.java @@ -16,10 +16,10 @@ */ package org.keycloak.themeverifier; -import org.apache.commons.io.filefilter.AbstractFileFilter; - import java.io.File; +import org.apache.commons.io.filefilter.AbstractFileFilter; + public class MessagePropertiesFilter extends AbstractFileFilter { public static MessagePropertiesFilter INSTANCE = new MessagePropertiesFilter(); diff --git a/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/ThemeVerifierMojo.java b/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/ThemeVerifierMojo.java index 75ba00b2441..d48a515c274 100644 --- a/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/ThemeVerifierMojo.java +++ b/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/ThemeVerifierMojo.java @@ -16,6 +16,12 @@ */ package org.keycloak.themeverifier; +import java.io.File; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.stream.Collectors; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.DirectoryFileFilter; import org.apache.maven.model.Resource; @@ -27,12 +33,6 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; -import java.io.File; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.stream.Collectors; - @Mojo(name = "verify-theme", defaultPhase = LifecyclePhase.INSTALL, threadSafe = true) public class ThemeVerifierMojo extends AbstractMojo { diff --git a/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/VerifyMessageProperties.java b/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/VerifyMessageProperties.java index 7cb2dc2a688..1e048ea4297 100644 --- a/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/VerifyMessageProperties.java +++ b/misc/theme-verifier/src/main/java/org/keycloak/themeverifier/VerifyMessageProperties.java @@ -16,9 +16,6 @@ */ package org.keycloak.themeverifier; -import org.apache.maven.plugin.MojoExecutionException; -import org.owasp.html.PolicyFactory; - import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -34,6 +31,9 @@ import java.util.PropertyResourceBundle; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.maven.plugin.MojoExecutionException; +import org.owasp.html.PolicyFactory; + public class VerifyMessageProperties { private final File file; diff --git a/misc/theme-verifier/src/test/java/org/keycloak/themeverifier/VerifyMessagePropertiesTest.java b/misc/theme-verifier/src/test/java/org/keycloak/themeverifier/VerifyMessagePropertiesTest.java index ef2943090be..a73f16fa5f3 100644 --- a/misc/theme-verifier/src/test/java/org/keycloak/themeverifier/VerifyMessagePropertiesTest.java +++ b/misc/theme-verifier/src/test/java/org/keycloak/themeverifier/VerifyMessagePropertiesTest.java @@ -16,15 +16,15 @@ */ package org.keycloak.themeverifier; +import java.io.File; +import java.net.URL; +import java.util.List; + import org.apache.maven.plugin.MojoExecutionException; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Test; -import java.io.File; -import java.net.URL; -import java.util.List; - class VerifyMessagePropertiesTest { @Test diff --git a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/InfinispanClusterProvider.java b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/InfinispanClusterProvider.java index db78685f7a5..ea9aaf0c231 100644 --- a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/InfinispanClusterProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/InfinispanClusterProvider.java @@ -27,15 +27,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.infinispan.Cache; -import org.infinispan.notifications.Listener; -import org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated; -import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified; -import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved; -import org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent; -import org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent; -import org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent; -import org.jboss.logging.Logger; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterListener; import org.keycloak.cluster.ClusterProvider; @@ -47,6 +38,16 @@ import org.keycloak.common.util.Time; import org.keycloak.connections.infinispan.TopologyInfo; import org.keycloak.models.sessions.infinispan.CacheDecorators; +import org.infinispan.Cache; +import org.infinispan.notifications.Listener; +import org.infinispan.notifications.cachelistener.annotation.CacheEntryCreated; +import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified; +import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved; +import org.infinispan.notifications.cachelistener.event.CacheEntryCreatedEvent; +import org.infinispan.notifications.cachelistener.event.CacheEntryModifiedEvent; +import org.infinispan.notifications.cachelistener.event.CacheEntryRemovedEvent; +import org.jboss.logging.Logger; + /** * * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/InfinispanClusterProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/InfinispanClusterProviderFactory.java index 8fe4ebf5104..3a23ad9f89a 100644 --- a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/InfinispanClusterProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/InfinispanClusterProviderFactory.java @@ -24,17 +24,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.stream.Collectors; -import org.infinispan.Cache; -import org.infinispan.configuration.cache.CacheMode; -import org.infinispan.context.Flag; -import org.infinispan.lifecycle.ComponentStatus; -import org.infinispan.notifications.Listener; -import org.infinispan.notifications.cachemanagerlistener.annotation.Merged; -import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged; -import org.infinispan.notifications.cachemanagerlistener.event.MergeEvent; -import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent; -import org.infinispan.remoting.transport.Address; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.cluster.ClusterProvider; import org.keycloak.cluster.ClusterProviderFactory; @@ -49,6 +38,18 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.EnvironmentDependentProviderFactory; +import org.infinispan.Cache; +import org.infinispan.configuration.cache.CacheMode; +import org.infinispan.context.Flag; +import org.infinispan.lifecycle.ComponentStatus; +import org.infinispan.notifications.Listener; +import org.infinispan.notifications.cachemanagerlistener.annotation.Merged; +import org.infinispan.notifications.cachemanagerlistener.annotation.ViewChanged; +import org.infinispan.notifications.cachemanagerlistener.event.MergeEvent; +import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent; +import org.infinispan.remoting.transport.Address; +import org.jboss.logging.Logger; + /** * This impl is aware of Cross-Data-Center scenario too * diff --git a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/LockEntry.java b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/LockEntry.java index e5cfa235fcc..2472121ecfb 100644 --- a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/LockEntry.java +++ b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/LockEntry.java @@ -17,9 +17,10 @@ package org.keycloak.cluster.infinispan; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.protostream.annotations.Proto; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/LockEntryPredicate.java b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/LockEntryPredicate.java index 1f839656b05..9e27e359dc9 100644 --- a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/LockEntryPredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/LockEntryPredicate.java @@ -23,10 +23,11 @@ import java.util.Map; import java.util.Set; import java.util.function.Predicate; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/WrapperClusterEvent.java b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/WrapperClusterEvent.java index 63370fe7c66..10fd9d63c8e 100644 --- a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/WrapperClusterEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/WrapperClusterEvent.java @@ -21,14 +21,15 @@ import java.util.Collection; import java.util.List; import java.util.Objects; +import org.keycloak.cluster.ClusterEvent; +import org.keycloak.cluster.ClusterProvider; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.protostream.WrappedMessage; import org.infinispan.protostream.annotations.Proto; import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.cluster.ClusterEvent; -import org.keycloak.cluster.ClusterProvider; -import org.keycloak.marshalling.Marshalling; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanClusterProvider.java b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanClusterProvider.java index c1996ef6428..a7712c5410f 100644 --- a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanClusterProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanClusterProvider.java @@ -28,8 +28,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import org.infinispan.client.hotrod.RemoteCache; -import org.jboss.logging.Logger; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterListener; import org.keycloak.cluster.ClusterProvider; @@ -38,6 +36,9 @@ import org.keycloak.cluster.infinispan.LockEntry; import org.keycloak.cluster.infinispan.TaskCallback; import org.keycloak.common.util.Retry; +import org.infinispan.client.hotrod.RemoteCache; +import org.jboss.logging.Logger; + import static org.keycloak.cluster.infinispan.InfinispanClusterProvider.TASK_KEY_PREFIX; import static org.keycloak.cluster.infinispan.remote.RemoteInfinispanClusterProviderFactory.putIfAbsentWithRetries; diff --git a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanClusterProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanClusterProviderFactory.java index b961f79250e..f19247f99cf 100644 --- a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanClusterProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanClusterProviderFactory.java @@ -21,10 +21,6 @@ import java.lang.invoke.MethodHandles; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.client.hotrod.exceptions.HotRodClientException; -import org.infinispan.commons.util.ByRef; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.cluster.ClusterProvider; import org.keycloak.cluster.ClusterProviderFactory; @@ -38,6 +34,11 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.EnvironmentDependentProviderFactory; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.client.hotrod.exceptions.HotRodClientException; +import org.infinispan.commons.util.ByRef; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.WORK_CACHE_NAME; public class RemoteInfinispanClusterProviderFactory implements ClusterProviderFactory, RemoteInfinispanClusterProvider.SharedData, EnvironmentDependentProviderFactory { diff --git a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanNotificationManager.java b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanNotificationManager.java index 3e1f20dc711..d419d4c2606 100644 --- a/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanNotificationManager.java +++ b/model/infinispan/src/main/java/org/keycloak/cluster/infinispan/remote/RemoteInfinispanNotificationManager.java @@ -25,6 +25,16 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; +import org.keycloak.cluster.ClusterEvent; +import org.keycloak.cluster.ClusterListener; +import org.keycloak.cluster.ClusterProvider.DCNotify; +import org.keycloak.cluster.infinispan.TaskCallback; +import org.keycloak.cluster.infinispan.WrapperClusterEvent; +import org.keycloak.common.util.ConcurrentMultivaluedHashMap; +import org.keycloak.common.util.Retry; +import org.keycloak.common.util.SecretGenerator; +import org.keycloak.connections.infinispan.TopologyInfo; + import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.annotation.ClientCacheEntryCreated; import org.infinispan.client.hotrod.annotation.ClientCacheEntryModified; @@ -35,15 +45,6 @@ import org.infinispan.client.hotrod.event.ClientCacheEntryModifiedEvent; import org.infinispan.client.hotrod.event.ClientCacheEntryRemovedEvent; import org.infinispan.client.hotrod.exceptions.HotRodClientException; import org.jboss.logging.Logger; -import org.keycloak.cluster.ClusterEvent; -import org.keycloak.cluster.ClusterListener; -import org.keycloak.cluster.ClusterProvider.DCNotify; -import org.keycloak.cluster.infinispan.TaskCallback; -import org.keycloak.cluster.infinispan.WrapperClusterEvent; -import org.keycloak.common.util.ConcurrentMultivaluedHashMap; -import org.keycloak.common.util.Retry; -import org.keycloak.common.util.SecretGenerator; -import org.keycloak.connections.infinispan.TopologyInfo; import static org.keycloak.cluster.infinispan.InfinispanClusterProvider.TASK_KEY_PREFIX; diff --git a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java index 6552b75d103..bf9c308a39e 100755 --- a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/DefaultInfinispanConnectionProviderFactory.java @@ -28,18 +28,6 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.stream.Collectors; -import org.infinispan.client.hotrod.RemoteCacheManager; -import org.infinispan.commons.configuration.io.ConfigurationWriter; -import org.infinispan.commons.io.StringBuilderWriter; -import org.infinispan.commons.util.Version; -import org.infinispan.configuration.cache.Configuration; -import org.infinispan.configuration.parsing.ConfigurationBuilderHolder; -import org.infinispan.factories.GlobalComponentRegistry; -import org.infinispan.configuration.parsing.ParserRegistry; -import org.infinispan.health.CacheHealth; -import org.infinispan.manager.DefaultCacheManager; -import org.infinispan.manager.EmbeddedCacheManager; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterProvider; @@ -68,6 +56,19 @@ import org.keycloak.spi.infinispan.CacheEmbeddedConfigProvider; import org.keycloak.spi.infinispan.CacheRemoteConfigProvider; import org.keycloak.spi.infinispan.impl.embedded.CacheConfigurator; +import org.infinispan.client.hotrod.RemoteCacheManager; +import org.infinispan.commons.configuration.io.ConfigurationWriter; +import org.infinispan.commons.io.StringBuilderWriter; +import org.infinispan.commons.util.Version; +import org.infinispan.configuration.cache.Configuration; +import org.infinispan.configuration.parsing.ConfigurationBuilderHolder; +import org.infinispan.configuration.parsing.ParserRegistry; +import org.infinispan.factories.GlobalComponentRegistry; +import org.infinispan.health.CacheHealth; +import org.infinispan.manager.DefaultCacheManager; +import org.infinispan.manager.EmbeddedCacheManager; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.AUTHENTICATION_SESSIONS_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLUSTERED_CACHE_NAMES; diff --git a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanConnectionProvider.java b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanConnectionProvider.java index 417fc16d463..d751891aae3 100755 --- a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanConnectionProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanConnectionProvider.java @@ -24,13 +24,14 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.function.Predicate; import java.util.stream.Stream; -import org.infinispan.Cache; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.util.concurrent.BlockingManager; import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.Provider; +import org.infinispan.Cache; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.util.concurrent.BlockingManager; + /** * @author Stian Thorgersen */ diff --git a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanUtil.java b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanUtil.java index 95f8e03d721..6be6ebfc7c1 100644 --- a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanUtil.java +++ b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/InfinispanUtil.java @@ -21,6 +21,10 @@ import java.time.Instant; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.keycloak.common.util.Time; +import org.keycloak.models.KeycloakSession; +import org.keycloak.spi.infinispan.impl.embedded.CacheConfigurator; + import org.infinispan.commons.time.TimeService; import org.infinispan.commons.util.FileLookup; import org.infinispan.commons.util.FileLookupFactory; @@ -36,9 +40,6 @@ import org.infinispan.remoting.transport.jgroups.JGroupsTransport; import org.infinispan.util.EmbeddedTimeService; import org.jboss.logging.Logger; import org.jgroups.JChannel; -import org.keycloak.common.util.Time; -import org.keycloak.models.KeycloakSession; -import org.keycloak.spi.infinispan.impl.embedded.CacheConfigurator; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/TopologyInfo.java b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/TopologyInfo.java index e97ed3ba61c..8a37a6c9cdc 100644 --- a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/TopologyInfo.java +++ b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/TopologyInfo.java @@ -21,6 +21,8 @@ import java.net.InetSocketAddress; import java.security.SecureRandom; import java.util.Objects; +import org.keycloak.Config; + import org.infinispan.Cache; import org.infinispan.distribution.DistributionManager; import org.infinispan.factories.GlobalComponentRegistry; @@ -33,7 +35,6 @@ import org.infinispan.remoting.transport.jgroups.JGroupsTransport; import org.jboss.logging.Logger; import org.jgroups.stack.IpAddress; import org.jgroups.util.NameCache; -import org.keycloak.Config; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/remote/RemoteInfinispanConnectionProvider.java b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/remote/RemoteInfinispanConnectionProvider.java index 4077acc54b8..5482dee028b 100644 --- a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/remote/RemoteInfinispanConnectionProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/remote/RemoteInfinispanConnectionProvider.java @@ -22,6 +22,9 @@ import java.util.Objects; import java.util.concurrent.CompletionStage; import java.util.concurrent.ScheduledExecutorService; +import org.keycloak.connections.infinispan.InfinispanConnectionProvider; +import org.keycloak.connections.infinispan.TopologyInfo; + import org.infinispan.Cache; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.RemoteCacheManager; @@ -30,8 +33,6 @@ import org.infinispan.factories.GlobalComponentRegistry; import org.infinispan.factories.KnownComponentNames; import org.infinispan.manager.EmbeddedCacheManager; import org.infinispan.util.concurrent.BlockingManager; -import org.keycloak.connections.infinispan.InfinispanConnectionProvider; -import org.keycloak.connections.infinispan.TopologyInfo; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.skipSessionsCacheIfRequired; diff --git a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/remote/RemoteLoadBalancerCheckProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/remote/RemoteLoadBalancerCheckProviderFactory.java index d6b477da2e5..f78c261ca71 100644 --- a/model/infinispan/src/main/java/org/keycloak/connections/infinispan/remote/RemoteLoadBalancerCheckProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/connections/infinispan/remote/RemoteLoadBalancerCheckProviderFactory.java @@ -28,13 +28,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; import java.util.stream.Collectors; -import org.infinispan.client.hotrod.impl.InternalRemoteCache; -import org.infinispan.client.hotrod.impl.operations.PingResponse; -import org.infinispan.commons.util.concurrent.CompletableFutures; -import org.infinispan.factories.ComponentRegistry; -import org.infinispan.persistence.manager.PersistenceManager; -import org.infinispan.util.concurrent.ActionSequencer; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; @@ -48,6 +41,14 @@ import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; +import org.infinispan.client.hotrod.impl.InternalRemoteCache; +import org.infinispan.client.hotrod.impl.operations.PingResponse; +import org.infinispan.commons.util.concurrent.CompletableFutures; +import org.infinispan.factories.ComponentRegistry; +import org.infinispan.persistence.manager.PersistenceManager; +import org.infinispan.util.concurrent.ActionSequencer; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLUSTERED_CACHE_NAMES; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.LOCAL_CACHE_NAMES; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.skipSessionsCacheIfRequired; diff --git a/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCacheCrlProvider.java b/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCacheCrlProvider.java index d45ac671918..717bc03c1a0 100644 --- a/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCacheCrlProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCacheCrlProvider.java @@ -17,12 +17,13 @@ package org.keycloak.crl.infinispan; -import org.infinispan.Cache; import org.keycloak.cluster.ClusterProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.cache.CacheCrlProvider; import org.keycloak.models.cache.infinispan.ClearCacheEvent; +import org.infinispan.Cache; + public class InfinispanCacheCrlProvider implements CacheCrlProvider { private final KeycloakSession session; diff --git a/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCacheCrlProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCacheCrlProviderFactory.java index 297b76ed99b..9e68aa76b45 100644 --- a/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCacheCrlProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCacheCrlProviderFactory.java @@ -17,7 +17,6 @@ package org.keycloak.crl.infinispan; -import org.infinispan.Cache; import org.keycloak.Config; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterProvider; @@ -27,6 +26,8 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.cache.CacheCrlProvider; import org.keycloak.models.cache.CacheCrlProviderFactory; +import org.infinispan.Cache; + public class InfinispanCacheCrlProviderFactory implements CacheCrlProviderFactory { public static final String PROVIDER_ID = "infinispan"; diff --git a/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCrlStorageProvider.java b/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCrlStorageProvider.java index 951cb8632ec..06eb87a63b7 100644 --- a/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCrlStorageProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCrlStorageProvider.java @@ -24,11 +24,13 @@ import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; -import org.infinispan.Cache; -import org.jboss.logging.Logger; + import org.keycloak.common.util.Time; import org.keycloak.crl.CrlStorageProvider; +import org.infinispan.Cache; +import org.jboss.logging.Logger; + /** * * @author rmartinc diff --git a/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCrlStorageProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCrlStorageProviderFactory.java index 19600fa299d..f4895d6a49e 100644 --- a/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCrlStorageProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/crl/infinispan/InfinispanCrlStorageProviderFactory.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; -import org.infinispan.Cache; + import org.keycloak.Config; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.crl.CrlStorageProvider; @@ -32,6 +32,8 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; +import org.infinispan.Cache; + /** * * @author rmartinc diff --git a/model/infinispan/src/main/java/org/keycloak/infinispan/compatibility/CachingEmbeddedMetadataProvider.java b/model/infinispan/src/main/java/org/keycloak/infinispan/compatibility/CachingEmbeddedMetadataProvider.java index 6de91338b92..373349732e3 100644 --- a/model/infinispan/src/main/java/org/keycloak/infinispan/compatibility/CachingEmbeddedMetadataProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/infinispan/compatibility/CachingEmbeddedMetadataProvider.java @@ -3,13 +3,14 @@ package org.keycloak.infinispan.compatibility; import java.util.Map; import java.util.stream.Stream; -import org.infinispan.commons.util.Version; import org.keycloak.Config; import org.keycloak.compatibility.AbstractCompatibilityMetadataProvider; import org.keycloak.infinispan.util.InfinispanUtils; import org.keycloak.spi.infinispan.CacheEmbeddedConfigProviderSpi; import org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory; +import org.infinispan.commons.util.Version; + public class CachingEmbeddedMetadataProvider extends AbstractCompatibilityMetadataProvider { public CachingEmbeddedMetadataProvider() { diff --git a/model/infinispan/src/main/java/org/keycloak/infinispan/health/impl/JdbcPingClusterHealthImpl.java b/model/infinispan/src/main/java/org/keycloak/infinispan/health/impl/JdbcPingClusterHealthImpl.java index 1fb07e2c91c..c6f5d2762eb 100644 --- a/model/infinispan/src/main/java/org/keycloak/infinispan/health/impl/JdbcPingClusterHealthImpl.java +++ b/model/infinispan/src/main/java/org/keycloak/infinispan/health/impl/JdbcPingClusterHealthImpl.java @@ -23,6 +23,10 @@ import java.util.concurrent.Executor; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Consumer; +import org.keycloak.infinispan.health.ClusterHealth; +import org.keycloak.jgroups.protocol.KEYCLOAK_JDBC_PING2; +import org.keycloak.jgroups.protocol.KEYCLOAK_JDBC_PING2.HealthStatus; + import org.infinispan.factories.annotations.Inject; import org.infinispan.factories.scopes.Scope; import org.infinispan.factories.scopes.Scopes; @@ -30,9 +34,6 @@ import org.infinispan.remoting.transport.Transport; import org.infinispan.remoting.transport.jgroups.JGroupsTransport; import org.infinispan.util.concurrent.BlockingManager; import org.jboss.logging.Logger; -import org.keycloak.infinispan.health.ClusterHealth; -import org.keycloak.jgroups.protocol.KEYCLOAK_JDBC_PING2; -import org.keycloak.jgroups.protocol.KEYCLOAK_JDBC_PING2.HealthStatus; /** * A {@link ClusterHealth} implementation that makes use of {@link KEYCLOAK_JDBC_PING2}. diff --git a/model/infinispan/src/main/java/org/keycloak/infinispan/module/KeycloakModule.java b/model/infinispan/src/main/java/org/keycloak/infinispan/module/KeycloakModule.java index 51bbe2b7d5f..cbab5ada775 100644 --- a/model/infinispan/src/main/java/org/keycloak/infinispan/module/KeycloakModule.java +++ b/model/infinispan/src/main/java/org/keycloak/infinispan/module/KeycloakModule.java @@ -1,11 +1,12 @@ package org.keycloak.infinispan.module; +import org.keycloak.jgroups.certificates.CertificateReloadManager; + import org.infinispan.configuration.global.GlobalConfiguration; import org.infinispan.factories.GlobalComponentRegistry; import org.infinispan.factories.annotations.InfinispanModule; import org.infinispan.factories.impl.BasicComponentRegistry; import org.infinispan.lifecycle.ModuleLifecycle; -import org.keycloak.jgroups.certificates.CertificateReloadManager; @InfinispanModule(name = "keycloak", requiredModules = {"core"}) public class KeycloakModule implements ModuleLifecycle { diff --git a/model/infinispan/src/main/java/org/keycloak/infinispan/module/configuration/global/KeycloakConfiguration.java b/model/infinispan/src/main/java/org/keycloak/infinispan/module/configuration/global/KeycloakConfiguration.java index 9405eb0e800..8e159aad38c 100644 --- a/model/infinispan/src/main/java/org/keycloak/infinispan/module/configuration/global/KeycloakConfiguration.java +++ b/model/infinispan/src/main/java/org/keycloak/infinispan/module/configuration/global/KeycloakConfiguration.java @@ -1,9 +1,10 @@ package org.keycloak.infinispan.module.configuration.global; +import org.keycloak.models.KeycloakSessionFactory; + import org.infinispan.commons.configuration.BuiltBy; import org.infinispan.commons.configuration.attributes.AttributeDefinition; import org.infinispan.commons.configuration.attributes.AttributeSet; -import org.keycloak.models.KeycloakSessionFactory; @BuiltBy(KeycloakConfigurationBuilder.class) public class KeycloakConfiguration { diff --git a/model/infinispan/src/main/java/org/keycloak/infinispan/module/configuration/global/KeycloakConfigurationBuilder.java b/model/infinispan/src/main/java/org/keycloak/infinispan/module/configuration/global/KeycloakConfigurationBuilder.java index d2aa92dd74d..2d7cccc22f7 100644 --- a/model/infinispan/src/main/java/org/keycloak/infinispan/module/configuration/global/KeycloakConfigurationBuilder.java +++ b/model/infinispan/src/main/java/org/keycloak/infinispan/module/configuration/global/KeycloakConfigurationBuilder.java @@ -1,10 +1,11 @@ package org.keycloak.infinispan.module.configuration.global; +import org.keycloak.models.KeycloakSessionFactory; + import org.infinispan.commons.configuration.Builder; import org.infinispan.commons.configuration.Combine; import org.infinispan.commons.configuration.attributes.AttributeSet; import org.infinispan.configuration.global.GlobalConfigurationBuilder; -import org.keycloak.models.KeycloakSessionFactory; public class KeycloakConfigurationBuilder implements Builder { diff --git a/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/CertificateReloadManagerFactory.java b/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/CertificateReloadManagerFactory.java index 1752e7f9993..6a5c0bb756d 100644 --- a/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/CertificateReloadManagerFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/CertificateReloadManagerFactory.java @@ -1,12 +1,13 @@ package org.keycloak.infinispan.module.factory; +import org.keycloak.infinispan.module.configuration.global.KeycloakConfiguration; +import org.keycloak.jgroups.certificates.CertificateReloadManager; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.spi.infinispan.JGroupsCertificateProvider; + import org.infinispan.factories.AbstractComponentFactory; import org.infinispan.factories.AutoInstantiableFactory; import org.infinispan.factories.annotations.DefaultFactoryFor; -import org.keycloak.jgroups.certificates.CertificateReloadManager; -import org.keycloak.infinispan.module.configuration.global.KeycloakConfiguration; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.spi.infinispan.JGroupsCertificateProvider; @DefaultFactoryFor(classes = CertificateReloadManager.class) public class CertificateReloadManagerFactory extends AbstractComponentFactory implements AutoInstantiableFactory { diff --git a/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/ClusterHealthFactory.java b/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/ClusterHealthFactory.java index 77241cd7478..fc904a3628c 100644 --- a/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/ClusterHealthFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/ClusterHealthFactory.java @@ -17,11 +17,12 @@ package org.keycloak.infinispan.module.factory; +import org.keycloak.infinispan.health.ClusterHealth; +import org.keycloak.infinispan.health.impl.JdbcPingClusterHealthImpl; + import org.infinispan.factories.AbstractComponentFactory; import org.infinispan.factories.AutoInstantiableFactory; import org.infinispan.factories.annotations.DefaultFactoryFor; -import org.keycloak.infinispan.health.ClusterHealth; -import org.keycloak.infinispan.health.impl.JdbcPingClusterHealthImpl; @DefaultFactoryFor(classes = ClusterHealth.class) public class ClusterHealthFactory extends AbstractComponentFactory implements AutoInstantiableFactory { diff --git a/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/InfinispanTelemetryFactory.java b/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/InfinispanTelemetryFactory.java index 10ff59d99a5..8703aa9d4c3 100644 --- a/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/InfinispanTelemetryFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/InfinispanTelemetryFactory.java @@ -1,8 +1,9 @@ package org.keycloak.infinispan.module.factory; -import io.opentelemetry.api.OpenTelemetry; import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.spi.CDI; + +import io.opentelemetry.api.OpenTelemetry; import org.infinispan.factories.AbstractComponentFactory; import org.infinispan.factories.AutoInstantiableFactory; import org.infinispan.factories.annotations.DefaultFactoryFor; diff --git a/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/OpenTelemetrySpan.java b/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/OpenTelemetrySpan.java index d8823cca725..c8ce184a139 100644 --- a/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/OpenTelemetrySpan.java +++ b/model/infinispan/src/main/java/org/keycloak/infinispan/module/factory/OpenTelemetrySpan.java @@ -1,13 +1,13 @@ package org.keycloak.infinispan.module.factory; +import java.util.Objects; + import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.StatusCode; import io.opentelemetry.context.Scope; import org.infinispan.telemetry.InfinispanSpan; import org.infinispan.telemetry.SafeAutoClosable; -import java.util.Objects; - public class OpenTelemetrySpan implements InfinispanSpan { private final Span span; diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/CertificateReloadManager.java b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/CertificateReloadManager.java index c3f7d9c1f5c..f2f85c12ed8 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/CertificateReloadManager.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/CertificateReloadManager.java @@ -24,6 +24,11 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.spi.infinispan.JGroupsCertificateProvider; + import org.infinispan.commons.api.Lifecycle; import org.infinispan.factories.KnownComponentNames; import org.infinispan.factories.annotations.ComponentName; @@ -41,10 +46,6 @@ import org.infinispan.notifications.cachemanagerlistener.event.ViewChangedEvent; import org.infinispan.remoting.transport.Address; import org.infinispan.util.concurrent.BlockingManager; import org.jboss.logging.Logger; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.spi.infinispan.JGroupsCertificateProvider; /** * Class to handle JGroups certificate reloading for encryption (mTLS). diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/DatabaseJGroupsCertificateProvider.java b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/DatabaseJGroupsCertificateProvider.java index 0e93fdcb767..861c55763a3 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/DatabaseJGroupsCertificateProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/DatabaseJGroupsCertificateProvider.java @@ -27,8 +27,9 @@ import java.util.Objects; import java.util.Optional; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; +import javax.net.ssl.KeyManager; +import javax.net.ssl.TrustManager; -import org.jboss.logging.Logger; import org.keycloak.common.util.Retry; import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; @@ -37,8 +38,7 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.spi.infinispan.JGroupsCertificateProvider; import org.keycloak.storage.configuration.ServerConfigStorageProvider; -import javax.net.ssl.KeyManager; -import javax.net.ssl.TrustManager; +import org.jboss.logging.Logger; import static org.keycloak.jgroups.certificates.JGroupsCertificate.fromJson; import static org.keycloak.jgroups.certificates.JGroupsCertificate.toJson; diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/FileJGroupsCertificateProvider.java b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/FileJGroupsCertificateProvider.java index 0c514829470..1c6ea54c381 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/FileJGroupsCertificateProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/FileJGroupsCertificateProvider.java @@ -18,13 +18,13 @@ package org.keycloak.jgroups.certificates; import java.util.Objects; +import javax.net.ssl.KeyManager; +import javax.net.ssl.TrustManager; + +import org.keycloak.spi.infinispan.JGroupsCertificateProvider; import org.jgroups.util.FileWatcher; import org.jgroups.util.SslContextFactory; -import org.keycloak.spi.infinispan.JGroupsCertificateProvider; - -import javax.net.ssl.KeyManager; -import javax.net.ssl.TrustManager; /** * A {@link JGroupsCertificateProvider} implementation that reads the key and trust stores from a file. diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/JGroupsCertificate.java b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/JGroupsCertificate.java index e4ba9599906..65e482bc65d 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/JGroupsCertificate.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/JGroupsCertificate.java @@ -22,11 +22,12 @@ import java.security.PrivateKey; import java.security.cert.X509Certificate; import java.util.Objects; +import org.keycloak.common.util.PemUtils; +import org.keycloak.util.JsonSerialization; + import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; -import org.keycloak.common.util.PemUtils; -import org.keycloak.util.JsonSerialization; /** * JPA entity to store the {@link X509Certificate} and {@link KeyPair}. diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadCertificateFunction.java b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadCertificateFunction.java index a8400bac6ec..36e258a591f 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadCertificateFunction.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadCertificateFunction.java @@ -19,11 +19,12 @@ package org.keycloak.jgroups.certificates; import java.util.function.Function; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.factories.GlobalComponentRegistry; import org.infinispan.manager.EmbeddedCacheManager; import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; /** * Reloads the JGroups certificate diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadingX509ExtendedKeyManager.java b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadingX509ExtendedKeyManager.java index 57c0a112467..cbdf2aa451b 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadingX509ExtendedKeyManager.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadingX509ExtendedKeyManager.java @@ -25,11 +25,10 @@ import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.Objects; import java.util.stream.Collectors; +import javax.net.ssl.X509ExtendedKeyManager; import org.jboss.logging.Logger; -import javax.net.ssl.X509ExtendedKeyManager; - /** * A {@link X509ExtendedKeyManager} implementation that allows to update the keys and certificates at runtime. */ diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadingX509ExtendedTrustManager.java b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadingX509ExtendedTrustManager.java index 39fded07d34..0e37a45b067 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadingX509ExtendedTrustManager.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/ReloadingX509ExtendedTrustManager.java @@ -21,7 +21,6 @@ import java.net.Socket; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.Objects; - import javax.net.ssl.SSLEngine; import javax.net.ssl.X509ExtendedTrustManager; diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/Utils.java b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/Utils.java index 0567add5498..9b3ee906902 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/Utils.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/certificates/Utils.java @@ -30,13 +30,6 @@ import java.time.Duration; import java.time.Instant; import java.util.Date; import java.util.UUID; - -import org.jboss.logging.Logger; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.CertificateUtils; -import org.keycloak.common.util.KeyUtils; -import org.keycloak.common.util.KeystoreUtil; - import javax.net.ssl.KeyManager; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.TrustManager; @@ -44,6 +37,13 @@ import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509ExtendedKeyManager; import javax.net.ssl.X509ExtendedTrustManager; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.CertificateUtils; +import org.keycloak.common.util.KeyUtils; +import org.keycloak.common.util.KeystoreUtil; + +import org.jboss.logging.Logger; + public final class Utils { private static final Logger logger = Logger.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/header/TracerHeader.java b/model/infinispan/src/main/java/org/keycloak/jgroups/header/TracerHeader.java index b386eaf86a5..6c1bc3b1532 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/header/TracerHeader.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/header/TracerHeader.java @@ -17,9 +17,6 @@ package org.keycloak.jgroups.header; -import org.jgroups.Header; -import org.jgroups.util.Util; - import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -28,6 +25,9 @@ import java.util.Map; import java.util.Set; import java.util.function.Supplier; +import org.jgroups.Header; +import org.jgroups.util.Util; + /** * Header which carries an OpenTelemetry {@link io.opentelemetry.api.trace.Span} between requests and responses * diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/protocol/KEYCLOAK_JDBC_PING2.java b/model/infinispan/src/main/java/org/keycloak/jgroups/protocol/KEYCLOAK_JDBC_PING2.java index a1962ae71ec..c69fe31b96a 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/protocol/KEYCLOAK_JDBC_PING2.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/protocol/KEYCLOAK_JDBC_PING2.java @@ -17,6 +17,15 @@ package org.keycloak.jgroups.protocol; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; + +import org.keycloak.connections.jpa.JpaConnectionProviderFactory; + import org.jgroups.Address; import org.jgroups.Event; import org.jgroups.PhysicalAddress; @@ -28,14 +37,6 @@ import org.jgroups.util.ExtendedUUID; import org.jgroups.util.NameCache; import org.jgroups.util.Responses; import org.jgroups.util.UUID; -import org.keycloak.connections.jpa.JpaConnectionProviderFactory; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; /** * Enhanced JDBC_PING2 to handle entries transactionally. diff --git a/model/infinispan/src/main/java/org/keycloak/jgroups/protocol/OPEN_TELEMETRY.java b/model/infinispan/src/main/java/org/keycloak/jgroups/protocol/OPEN_TELEMETRY.java index 168b364b698..169972ebcbb 100644 --- a/model/infinispan/src/main/java/org/keycloak/jgroups/protocol/OPEN_TELEMETRY.java +++ b/model/infinispan/src/main/java/org/keycloak/jgroups/protocol/OPEN_TELEMETRY.java @@ -17,6 +17,11 @@ package org.keycloak.jgroups.protocol; +import java.util.ArrayList; +import java.util.List; + +import org.keycloak.jgroups.header.TracerHeader; + import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.Span; @@ -34,10 +39,6 @@ import org.jgroups.annotations.MBean; import org.jgroups.annotations.Property; import org.jgroups.stack.Protocol; import org.jgroups.util.MessageBatch; -import org.keycloak.jgroups.header.TracerHeader; - -import java.util.ArrayList; -import java.util.List; /** * Provides Open Telemetry (https://opentelemetry.io/) tracing for JGroups. It should be placed just above the diff --git a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanCachePublicKeyProvider.java b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanCachePublicKeyProvider.java index 302319d8dea..c290bedbf25 100644 --- a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanCachePublicKeyProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanCachePublicKeyProvider.java @@ -17,12 +17,13 @@ package org.keycloak.keys.infinispan; -import org.infinispan.Cache; import org.keycloak.cluster.ClusterProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.cache.CachePublicKeyProvider; import org.keycloak.models.cache.infinispan.ClearCacheEvent; +import org.infinispan.Cache; + public class InfinispanCachePublicKeyProvider implements CachePublicKeyProvider { private final KeycloakSession session; diff --git a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanCachePublicKeyProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanCachePublicKeyProviderFactory.java index fa649d26a6f..54ace37ee61 100644 --- a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanCachePublicKeyProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanCachePublicKeyProviderFactory.java @@ -17,7 +17,6 @@ package org.keycloak.keys.infinispan; -import org.infinispan.Cache; import org.keycloak.Config; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterProvider; @@ -27,6 +26,8 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.cache.CachePublicKeyProvider; import org.keycloak.models.cache.CachePublicKeyProviderFactory; +import org.infinispan.Cache; + public class InfinispanCachePublicKeyProviderFactory implements CachePublicKeyProviderFactory { public static final String PROVIDER_ID = "infinispan"; diff --git a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProvider.java b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProvider.java index 2fdfa56851d..817d600afee 100644 --- a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProvider.java @@ -29,8 +29,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.stream.Collectors; -import org.infinispan.Cache; -import org.jboss.logging.Logger; import org.keycloak.cluster.ClusterProvider; import org.keycloak.common.util.Time; import org.keycloak.crypto.KeyWrapper; @@ -40,6 +38,9 @@ import org.keycloak.keys.PublicKeyStorageProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakTransaction; +import org.infinispan.Cache; +import org.jboss.logging.Logger; + /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProviderFactory.java index 4c5cda4477a..84a11a89165 100644 --- a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/InfinispanPublicKeyStorageProviderFactory.java @@ -23,8 +23,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.FutureTask; -import org.infinispan.Cache; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.jose.jwk.JWK; @@ -40,6 +38,9 @@ import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ProviderEvent; import org.keycloak.provider.ProviderEventListener; +import org.infinispan.Cache; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/PublicKeyStorageInvalidationEvent.java b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/PublicKeyStorageInvalidationEvent.java index 8c8426940b7..f7b276f7edd 100644 --- a/model/infinispan/src/main/java/org/keycloak/keys/infinispan/PublicKeyStorageInvalidationEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/keys/infinispan/PublicKeyStorageInvalidationEvent.java @@ -17,11 +17,12 @@ package org.keycloak.keys.infinispan; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.events.InvalidationEvent; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/marshalling/KeycloakModelSchema.java b/model/infinispan/src/main/java/org/keycloak/marshalling/KeycloakModelSchema.java index 3506d864433..968c4572647 100644 --- a/model/infinispan/src/main/java/org/keycloak/marshalling/KeycloakModelSchema.java +++ b/model/infinispan/src/main/java/org/keycloak/marshalling/KeycloakModelSchema.java @@ -20,15 +20,6 @@ package org.keycloak.marshalling; import java.util.Objects; import java.util.Optional; -import org.infinispan.protostream.FileDescriptorSource; -import org.infinispan.protostream.GeneratedSchema; -import org.infinispan.protostream.annotations.ProtoSchema; -import org.infinispan.protostream.annotations.ProtoSyntax; -import org.infinispan.protostream.config.Configuration; -import org.infinispan.protostream.descriptors.Descriptor; -import org.infinispan.protostream.descriptors.FileDescriptor; -import org.infinispan.protostream.impl.parser.ProtostreamProtoParser; -import org.infinispan.protostream.types.java.CommonTypes; import org.keycloak.cluster.infinispan.LockEntry; import org.keycloak.cluster.infinispan.LockEntryPredicate; import org.keycloak.cluster.infinispan.WrapperClusterEvent; @@ -110,6 +101,16 @@ import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.managers.UserStorageSyncManager; +import org.infinispan.protostream.FileDescriptorSource; +import org.infinispan.protostream.GeneratedSchema; +import org.infinispan.protostream.annotations.ProtoSchema; +import org.infinispan.protostream.annotations.ProtoSyntax; +import org.infinispan.protostream.config.Configuration; +import org.infinispan.protostream.descriptors.Descriptor; +import org.infinispan.protostream.descriptors.FileDescriptor; +import org.infinispan.protostream.impl.parser.ProtostreamProtoParser; +import org.infinispan.protostream.types.java.CommonTypes; + @ProtoSchema( syntax = ProtoSyntax.PROTO3, schemaPackageName = Marshalling.PROTO_SCHEMA_PACKAGE, diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/CacheManager.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/CacheManager.java index a0fa8d3d7f9..d58dbced4a0 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/CacheManager.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/CacheManager.java @@ -1,12 +1,5 @@ package org.keycloak.models.cache.infinispan; -import org.infinispan.Cache; -import org.jboss.logging.Logger; -import org.keycloak.cluster.ClusterProvider; -import org.keycloak.models.cache.infinispan.events.InvalidationEvent; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.cache.infinispan.entities.Revisioned; - import java.util.Collection; import java.util.HashSet; import java.util.Iterator; @@ -15,6 +8,14 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.Predicate; +import org.keycloak.cluster.ClusterProvider; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.cache.infinispan.entities.Revisioned; +import org.keycloak.models.cache.infinispan.events.InvalidationEvent; + +import org.infinispan.Cache; +import org.jboss.logging.Logger; + /** * * Some notes on how this works: diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClearCacheEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClearCacheEvent.java index 1ac3b458aaa..17c3a28eba3 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClearCacheEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClearCacheEvent.java @@ -16,11 +16,12 @@ */ package org.keycloak.models.cache.infinispan; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.cluster.ClusterEvent; import org.keycloak.marshalling.Marshalling; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientAdapter.java index 6a1d7609153..c58083dc776 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientAdapter.java @@ -17,15 +17,6 @@ package org.keycloak.models.cache.infinispan; -import org.keycloak.models.ClientModel; -import org.keycloak.models.ClientScopeModel; -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleModel; -import org.keycloak.models.cache.CachedObject; -import org.keycloak.models.cache.infinispan.entities.CachedClient; -import org.keycloak.models.utils.RoleUtils; - import java.security.MessageDigest; import java.util.Collections; import java.util.HashMap; @@ -35,6 +26,15 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Stream; +import org.keycloak.models.ClientModel; +import org.keycloak.models.ClientScopeModel; +import org.keycloak.models.ProtocolMapperModel; +import org.keycloak.models.RealmModel; +import org.keycloak.models.RoleModel; +import org.keycloak.models.cache.CachedObject; +import org.keycloak.models.cache.infinispan.entities.CachedClient; +import org.keycloak.models.utils.RoleUtils; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientScopeAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientScopeAdapter.java index 01a49625821..2ec99ab65ae 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientScopeAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/ClientScopeAdapter.java @@ -17,6 +17,12 @@ package org.keycloak.models.cache.infinispan; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Supplier; +import java.util.stream.Stream; + import org.keycloak.models.ClientScopeModel; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; @@ -24,12 +30,6 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.cache.infinispan.entities.CachedClientScope; import org.keycloak.models.utils.RoleUtils; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Supplier; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/DefaultLazyLoader.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/DefaultLazyLoader.java index 0a63c53ed1c..349f7cc6957 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/DefaultLazyLoader.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/DefaultLazyLoader.java @@ -16,13 +16,13 @@ */ package org.keycloak.models.cache.infinispan; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.runWithoutAuthorization; - import java.util.function.Function; import java.util.function.Supplier; import org.keycloak.models.KeycloakSession; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.runWithoutAuthorization; + /** * Default implementation of {@link DefaultLazyLoader} that only fetches data once. This implementation is thread-safe * as cached data is used in instanced of {@link org.keycloak.models.cache.infinispan.entities.CachedRealm} which are shared diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/GroupAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/GroupAdapter.java index d414e8dc6e0..87b735008ff 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/GroupAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/GroupAdapter.java @@ -17,6 +17,13 @@ package org.keycloak.models.cache.infinispan; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; @@ -26,13 +33,6 @@ import org.keycloak.models.cache.infinispan.entities.CachedGroup; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RoleUtils; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheRealmProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheRealmProviderFactory.java index ef2ce2b0f89..b94c237e92c 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheRealmProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanCacheRealmProviderFactory.java @@ -17,8 +17,6 @@ package org.keycloak.models.cache.infinispan; -import org.infinispan.Cache; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterProvider; @@ -30,6 +28,9 @@ import org.keycloak.models.cache.CacheRealmProviderFactory; import org.keycloak.models.cache.infinispan.entities.Revisioned; import org.keycloak.models.cache.infinispan.events.InvalidationEvent; +import org.infinispan.Cache; +import org.jboss.logging.Logger; + /** * @author Bill Burke * @author Stian Thorgersen diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanUserCacheProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanUserCacheProviderFactory.java index 24723cd9242..1a7eb3b58df 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanUserCacheProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/InfinispanUserCacheProviderFactory.java @@ -17,8 +17,6 @@ package org.keycloak.models.cache.infinispan; -import org.infinispan.Cache; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterProvider; @@ -30,6 +28,9 @@ import org.keycloak.models.cache.UserCacheProviderFactory; import org.keycloak.models.cache.infinispan.entities.Revisioned; import org.keycloak.models.cache.infinispan.events.InvalidationEvent; +import org.infinispan.Cache; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmAdapter.java index 3479b9a7f66..1943c5c112b 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmAdapter.java @@ -17,13 +17,19 @@ package org.keycloak.models.cache.infinispan; -import static org.keycloak.models.utils.KeycloakModelUtils.runOnRealm; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.stream.Stream; import org.keycloak.Config; -import org.keycloak.models.IdentityProviderQuery; import org.keycloak.cluster.ClusterProvider; -import org.keycloak.common.enums.SslRequired; import org.keycloak.common.Profile; +import org.keycloak.common.enums.SslRequired; import org.keycloak.component.ComponentModel; import org.keycloak.models.AbstractKeycloakTransaction; import org.keycloak.models.AuthenticationExecutionModel; @@ -36,6 +42,7 @@ import org.keycloak.models.ClientScopeModel; import org.keycloak.models.GroupModel; import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderQuery; import org.keycloak.models.KeycloakSession; import org.keycloak.models.OAuth2DeviceConfig; import org.keycloak.models.OTPPolicy; @@ -55,14 +62,7 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageUtil; import org.keycloak.storage.client.ClientStorageProvider; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.stream.Stream; +import static org.keycloak.models.utils.KeycloakModelUtils.runOnRealm; /** * @author Bill Burke diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheManager.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheManager.java index d200b02fdb0..824e4a638b8 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheManager.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheManager.java @@ -17,11 +17,14 @@ package org.keycloak.models.cache.infinispan; -import org.infinispan.Cache; -import org.jboss.logging.Logger; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.ReentrantLock; +import java.util.function.BiFunction; + import org.keycloak.models.KeycloakSession; -import org.keycloak.models.cache.infinispan.events.InvalidationEvent; import org.keycloak.models.cache.infinispan.entities.Revisioned; +import org.keycloak.models.cache.infinispan.events.InvalidationEvent; import org.keycloak.models.cache.infinispan.events.RealmCacheInvalidationEvent; import org.keycloak.models.cache.infinispan.stream.GroupListPredicate; import org.keycloak.models.cache.infinispan.stream.HasRolePredicate; @@ -29,10 +32,8 @@ import org.keycloak.models.cache.infinispan.stream.InClientPredicate; import org.keycloak.models.cache.infinispan.stream.InGroupPredicate; import org.keycloak.models.cache.infinispan.stream.InRealmPredicate; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.ReentrantLock; -import java.util.function.BiFunction; +import org.infinispan.Cache; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java index d5f4342cf0c..ce8ea9f3194 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java @@ -26,7 +26,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.client.clienttype.ClientTypeManager; import org.keycloak.cluster.ClusterProvider; import org.keycloak.common.Profile; @@ -60,8 +59,9 @@ import org.keycloak.models.cache.infinispan.entities.ClientScopeListQuery; import org.keycloak.models.cache.infinispan.entities.GroupListQuery; import org.keycloak.models.cache.infinispan.entities.GroupNameQuery; import org.keycloak.models.cache.infinispan.entities.RealmListQuery; -import org.keycloak.models.cache.infinispan.entities.RoleListQuery; import org.keycloak.models.cache.infinispan.entities.RoleByNameQuery; +import org.keycloak.models.cache.infinispan.entities.RoleListQuery; +import org.keycloak.models.cache.infinispan.events.CacheKeyInvalidatedEvent; import org.keycloak.models.cache.infinispan.events.ClientAddedEvent; import org.keycloak.models.cache.infinispan.events.ClientRemovedEvent; import org.keycloak.models.cache.infinispan.events.ClientScopeAddedEvent; @@ -72,7 +72,6 @@ import org.keycloak.models.cache.infinispan.events.GroupMovedEvent; import org.keycloak.models.cache.infinispan.events.GroupRemovedEvent; import org.keycloak.models.cache.infinispan.events.GroupUpdatedEvent; import org.keycloak.models.cache.infinispan.events.InvalidationEvent; -import org.keycloak.models.cache.infinispan.events.CacheKeyInvalidatedEvent; import org.keycloak.models.cache.infinispan.events.RealmRemovedEvent; import org.keycloak.models.cache.infinispan.events.RealmUpdatedEvent; import org.keycloak.models.cache.infinispan.events.RoleAddedEvent; @@ -84,6 +83,8 @@ import org.keycloak.storage.StorageId; import org.keycloak.storage.StoreManagers; import org.keycloak.storage.client.ClientStorageProviderModel; +import org.jboss.logging.Logger; + /** * - the high level architecture of this cache is an invalidation cache. diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RoleAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RoleAdapter.java index f7dbf342be5..95761e9606f 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RoleAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RoleAdapter.java @@ -17,6 +17,14 @@ package org.keycloak.models.cache.infinispan; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Stream; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleContainerModel; @@ -26,14 +34,6 @@ import org.keycloak.models.cache.infinispan.entities.CachedRealmRole; import org.keycloak.models.cache.infinispan.entities.CachedRole; import org.keycloak.models.utils.KeycloakModelUtils; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserAdapter.java index aadead506ea..40a54a93959 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserAdapter.java @@ -17,6 +17,18 @@ package org.keycloak.models.cache.infinispan; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.common.util.CollectionUtil; import org.keycloak.credential.CredentialModel; import org.keycloak.models.ClientModel; @@ -32,18 +44,6 @@ import org.keycloak.models.cache.infinispan.entities.CachedUser; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RoleUtils; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheManager.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheManager.java index c381e23809a..9fb950b43e3 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheManager.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheManager.java @@ -17,15 +17,16 @@ package org.keycloak.models.cache.infinispan; -import org.infinispan.Cache; -import org.jboss.logging.Logger; -import org.keycloak.models.cache.infinispan.events.InvalidationEvent; +import java.util.Map; +import java.util.Set; + import org.keycloak.models.cache.infinispan.entities.Revisioned; +import org.keycloak.models.cache.infinispan.events.InvalidationEvent; import org.keycloak.models.cache.infinispan.events.UserCacheInvalidationEvent; import org.keycloak.models.cache.infinispan.stream.InRealmPredicate; -import java.util.Map; -import java.util.Set; +import org.infinispan.Cache; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheSession.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheSession.java index 59c3c455372..c3ab649879f 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheSession.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/UserCacheSession.java @@ -17,30 +17,35 @@ package org.keycloak.models.cache.infinispan; -import static java.util.Optional.ofNullable; -import static org.keycloak.organization.utils.Organizations.isReadOnlyOrganizationMember; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.cluster.ClusterProvider; -import org.keycloak.credential.CredentialInput; -import org.keycloak.models.ClientScopeModel; -import org.keycloak.models.CredentialValidationOutput; -import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.UserCredentialManager; -import org.keycloak.models.cache.infinispan.events.CacheKeyInvalidatedEvent; -import org.keycloak.models.cache.infinispan.events.InvalidationEvent; import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.component.ComponentModel; import org.keycloak.connections.jpa.support.EntityManagers; +import org.keycloak.credential.CredentialInput; import org.keycloak.models.ClientModel; +import org.keycloak.models.ClientScopeModel; +import org.keycloak.models.CredentialValidationOutput; import org.keycloak.models.FederatedIdentityModel; import org.keycloak.models.GroupModel; +import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakTransaction; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserConsentModel; +import org.keycloak.models.UserCredentialManager; import org.keycloak.models.UserModel; import org.keycloak.models.UserProvider; import org.keycloak.models.cache.CachedUserModel; @@ -51,6 +56,8 @@ import org.keycloak.models.cache.infinispan.entities.CachedUser; import org.keycloak.models.cache.infinispan.entities.CachedUserConsent; import org.keycloak.models.cache.infinispan.entities.CachedUserConsents; import org.keycloak.models.cache.infinispan.entities.UserListQuery; +import org.keycloak.models.cache.infinispan.events.CacheKeyInvalidatedEvent; +import org.keycloak.models.cache.infinispan.events.InvalidationEvent; import org.keycloak.models.cache.infinispan.events.UserCacheRealmInvalidationEvent; import org.keycloak.models.cache.infinispan.events.UserConsentsUpdatedEvent; import org.keycloak.models.cache.infinispan.events.UserFederationLinkRemovedEvent; @@ -62,10 +69,10 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.ReadOnlyUserModelDelegate; import org.keycloak.storage.CacheableStorageProviderModel; import org.keycloak.storage.DatastoreProvider; -import org.keycloak.storage.StoreManagers; import org.keycloak.storage.OnCreateComponent; import org.keycloak.storage.OnUpdateComponent; import org.keycloak.storage.StorageId; +import org.keycloak.storage.StoreManagers; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.client.ClientStorageProvider; @@ -73,16 +80,11 @@ import org.keycloak.userprofile.AttributeMetadata; import org.keycloak.userprofile.UserProfileDecorator; import org.keycloak.userprofile.UserProfileMetadata; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; + +import static java.util.Optional.ofNullable; + +import static org.keycloak.organization.utils.Organizations.isReadOnlyOrganizationMember; /** * @author Bill Burke diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/InfinispanCacheStoreFactoryProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/InfinispanCacheStoreFactoryProviderFactory.java index a5726a07de7..adda5178731 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/InfinispanCacheStoreFactoryProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/InfinispanCacheStoreFactoryProviderFactory.java @@ -17,10 +17,6 @@ package org.keycloak.models.cache.infinispan.authorization; -import static org.keycloak.models.cache.infinispan.InfinispanCacheRealmProviderFactory.REALM_CLEAR_CACHE_EVENTS; - -import org.infinispan.Cache; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterProvider; @@ -32,6 +28,11 @@ import org.keycloak.models.cache.authorization.CachedStoreProviderFactory; import org.keycloak.models.cache.infinispan.entities.Revisioned; import org.keycloak.models.cache.infinispan.events.InvalidationEvent; +import org.infinispan.Cache; +import org.jboss.logging.Logger; + +import static org.keycloak.models.cache.infinispan.InfinispanCacheRealmProviderFactory.REALM_CLEAR_CACHE_EVENTS; + /** * @author Bill Burke * @author Stian Thorgersen diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/PolicyAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/PolicyAdapter.java index 0828e5b0544..b06e38c58b2 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/PolicyAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/PolicyAdapter.java @@ -16,6 +16,14 @@ */ package org.keycloak.models.cache.infinispan.authorization; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import org.keycloak.authorization.model.CachedModel; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; @@ -30,14 +38,6 @@ import org.keycloak.models.cache.infinispan.authorization.entities.CachedPolicy; import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.Logic; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/ResourceAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/ResourceAdapter.java index be9844b9b26..c85504da63d 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/ResourceAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/ResourceAdapter.java @@ -16,6 +16,14 @@ */ package org.keycloak.models.cache.infinispan.authorization; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import org.keycloak.authorization.model.CachedModel; import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.model.Resource; @@ -27,14 +35,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.cache.infinispan.LazyModel; import org.keycloak.models.cache.infinispan.authorization.entities.CachedResource; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/StoreFactoryCacheManager.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/StoreFactoryCacheManager.java index b37afa1ca19..633ffc6345b 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/StoreFactoryCacheManager.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/StoreFactoryCacheManager.java @@ -16,8 +16,9 @@ */ package org.keycloak.models.cache.infinispan.authorization; -import org.infinispan.Cache; -import org.jboss.logging.Logger; +import java.util.Objects; +import java.util.Set; + import org.keycloak.models.cache.infinispan.CacheManager; import org.keycloak.models.cache.infinispan.authorization.events.AuthorizationCacheInvalidationEvent; import org.keycloak.models.cache.infinispan.authorization.stream.InResourcePredicate; @@ -26,8 +27,8 @@ import org.keycloak.models.cache.infinispan.authorization.stream.InScopePredicat import org.keycloak.models.cache.infinispan.entities.Revisioned; import org.keycloak.models.cache.infinispan.events.InvalidationEvent; -import java.util.Objects; -import java.util.Set; +import org.infinispan.Cache; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/StoreFactoryCacheSession.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/StoreFactoryCacheSession.java index a10155af9f4..c3601c18fd5 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/StoreFactoryCacheSession.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/StoreFactoryCacheSession.java @@ -31,7 +31,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.authorization.UserManagedPermissionUtil; import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.model.Policy; @@ -81,6 +80,8 @@ import org.keycloak.models.cache.infinispan.events.InvalidationEvent; import org.keycloak.representations.idm.authorization.AbstractPolicyRepresentation; import org.keycloak.storage.StorageId; +import org.jboss.logging.Logger; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/CachedPolicy.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/CachedPolicy.java index 1956c17bf5c..a29ae23aca9 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/CachedPolicy.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/CachedPolicy.java @@ -18,6 +18,13 @@ package org.keycloak.models.cache.infinispan.authorization.entities; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.Scope; @@ -28,13 +35,6 @@ import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned; import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.Logic; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; - /** * @author Pedro Igor */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/CachedResource.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/CachedResource.java index 4b18f9caede..d0ec79cb898 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/CachedResource.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/CachedResource.java @@ -18,14 +18,6 @@ package org.keycloak.models.cache.infinispan.authorization.entities; -import org.keycloak.authorization.model.Resource; -import org.keycloak.authorization.model.Scope; -import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.cache.infinispan.DefaultLazyLoader; -import org.keycloak.models.cache.infinispan.LazyLoader; -import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned; - import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -34,6 +26,14 @@ import java.util.Set; import java.util.function.Supplier; import java.util.stream.Collectors; +import org.keycloak.authorization.model.Resource; +import org.keycloak.authorization.model.Scope; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.cache.infinispan.DefaultLazyLoader; +import org.keycloak.models.cache.infinispan.LazyLoader; +import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned; + /** * @author Pedro Igor */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyListQuery.java index 0b2227ab92e..f4a1f437457 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyListQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/PolicyListQuery.java @@ -1,10 +1,10 @@ package org.keycloak.models.cache.infinispan.authorization.entities; -import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned; - import java.util.HashSet; import java.util.Set; +import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceListQuery.java index d8db81bd5c2..67a6bc7d910 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceListQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ResourceListQuery.java @@ -1,10 +1,10 @@ package org.keycloak.models.cache.infinispan.authorization.entities; -import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned; - import java.util.HashSet; import java.util.Set; +import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ScopeListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ScopeListQuery.java index 2579e61b78c..378de4728d8 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ScopeListQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/entities/ScopeListQuery.java @@ -1,10 +1,10 @@ package org.keycloak.models.cache.infinispan.authorization.entities; -import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned; - import java.util.HashSet; import java.util.Set; +import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/AuthorizationCacheInvalidationEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/AuthorizationCacheInvalidationEvent.java index 3f4add18f8b..b4572bffb25 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/AuthorizationCacheInvalidationEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/AuthorizationCacheInvalidationEvent.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.cache.infinispan.authorization.events; -import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; - import java.util.Set; +import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BasePermissionTicketEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BasePermissionTicketEvent.java index 1af0cbccd69..67739bacc68 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BasePermissionTicketEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BasePermissionTicketEvent.java @@ -19,9 +19,10 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Objects; -import org.infinispan.protostream.annotations.ProtoField; import org.keycloak.models.cache.infinispan.events.InvalidationEvent; +import org.infinispan.protostream.annotations.ProtoField; + abstract class BasePermissionTicketEvent extends InvalidationEvent implements AuthorizationCacheInvalidationEvent { private final String owner; diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BasePolicyEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BasePolicyEvent.java index 16ec87e9bb6..c93286f6dfb 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BasePolicyEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BasePolicyEvent.java @@ -21,9 +21,10 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoField; import org.keycloak.models.cache.infinispan.events.InvalidationEvent; +import org.infinispan.protostream.annotations.ProtoField; + abstract class BasePolicyEvent extends InvalidationEvent implements AuthorizationCacheInvalidationEvent { @ProtoField(2) diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BaseResourceEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BaseResourceEvent.java index 3f756f137cd..f32e879cdc8 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BaseResourceEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BaseResourceEvent.java @@ -21,9 +21,10 @@ import java.util.HashSet; import java.util.Objects; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoField; import org.keycloak.models.cache.infinispan.events.InvalidationEvent; +import org.infinispan.protostream.annotations.ProtoField; + abstract class BaseResourceEvent extends InvalidationEvent implements AuthorizationCacheInvalidationEvent { @ProtoField(2) diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BaseScopeEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BaseScopeEvent.java index 1ffbf4348a7..40d74d29a2f 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BaseScopeEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/BaseScopeEvent.java @@ -19,9 +19,10 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Objects; -import org.infinispan.protostream.annotations.ProtoField; import org.keycloak.models.cache.infinispan.events.InvalidationEvent; +import org.infinispan.protostream.annotations.ProtoField; + abstract class BaseScopeEvent extends InvalidationEvent implements AuthorizationCacheInvalidationEvent { @ProtoField(2) diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PermissionTicketRemovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PermissionTicketRemovedEvent.java index 7266fb91150..7cc2d42d9f5 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PermissionTicketRemovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PermissionTicketRemovedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PermissionTicketUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PermissionTicketUpdatedEvent.java index 8b6f04516b0..503585805ba 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PermissionTicketUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PermissionTicketUpdatedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PolicyRemovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PolicyRemovedEvent.java index a72e7320a93..55c4db79f2e 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PolicyRemovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PolicyRemovedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PolicyUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PolicyUpdatedEvent.java index df5e80abf7a..d8eb2b76123 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PolicyUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/PolicyUpdatedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceRemovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceRemovedEvent.java index 6f88bcf6534..7f9ddd8f9dc 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceRemovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceRemovedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceServerRemovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceServerRemovedEvent.java index 7db29bda2a7..6b734c09290 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceServerRemovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceServerRemovedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceServerUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceServerUpdatedEvent.java index f6a41f82576..3634cc97d51 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceServerUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceServerUpdatedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceUpdatedEvent.java index be0c276a3fb..6542a71aff8 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ResourceUpdatedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ScopeRemovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ScopeRemovedEvent.java index 5564fdb6a2c..2e0a78989e8 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ScopeRemovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ScopeRemovedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ScopeUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ScopeUpdatedEvent.java index 35eb4d36a75..8047c2e1682 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ScopeUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/events/ScopeUpdatedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.authorization.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.StoreFactoryCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InResourcePredicate.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InResourcePredicate.java index cff9e1316a2..45a4c6b057d 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InResourcePredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InResourcePredicate.java @@ -16,17 +16,18 @@ */ package org.keycloak.models.cache.infinispan.authorization.stream; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.models.cache.infinispan.authorization.entities.InResource; -import org.keycloak.models.cache.infinispan.entities.Revisioned; -import org.keycloak.marshalling.Marshalling; - import java.util.Map; import java.util.Objects; import java.util.function.Predicate; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.cache.infinispan.authorization.entities.InResource; +import org.keycloak.models.cache.infinispan.entities.Revisioned; + +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Pedro Igor */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InResourceServerPredicate.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InResourceServerPredicate.java index 671f391fe37..805f237d6dd 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InResourceServerPredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InResourceServerPredicate.java @@ -4,13 +4,14 @@ import java.util.Map; import java.util.Objects; import java.util.function.Predicate; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.entities.InResourceServer; import org.keycloak.models.cache.infinispan.entities.Revisioned; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InScopePredicate.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InScopePredicate.java index 16c54be17f2..62d1d437280 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InScopePredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/authorization/stream/InScopePredicate.java @@ -4,13 +4,14 @@ import java.util.Map; import java.util.Objects; import java.util.function.Predicate; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.authorization.entities.InScope; import org.keycloak.models.cache.infinispan.entities.Revisioned; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientScope.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientScope.java index 1e1acb12d01..eb45cadcabe 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientScope.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedClientScope.java @@ -17,16 +17,16 @@ package org.keycloak.models.cache.infinispan.entities; -import org.keycloak.models.ClientScopeModel; -import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleModel; - import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.models.ClientScopeModel; +import org.keycloak.models.RealmModel; +import org.keycloak.models.RoleModel; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedFederatedIdentityLinks.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedFederatedIdentityLinks.java index 26f465bd8bd..a4e28164688 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedFederatedIdentityLinks.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedFederatedIdentityLinks.java @@ -17,12 +17,12 @@ package org.keycloak.models.cache.infinispan.entities; -import org.keycloak.models.FederatedIdentityModel; -import org.keycloak.models.RealmModel; - import java.util.HashSet; import java.util.Set; +import org.keycloak.models.FederatedIdentityModel; +import org.keycloak.models.RealmModel; + /** * The cache entry, which contains list of all identityProvider links for particular user. It needs to be updated every time when any * federation link is added, removed or updated for the user diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedGroup.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedGroup.java index 4345d256ce4..48664187383 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedGroup.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedGroup.java @@ -17,6 +17,11 @@ package org.keycloak.models.cache.infinispan.entities; +import java.util.Collections; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.GroupModel; import org.keycloak.models.GroupModel.Type; @@ -26,11 +31,6 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.cache.infinispan.DefaultLazyLoader; import org.keycloak.models.cache.infinispan.LazyLoader; -import java.util.Collections; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java index 8febcbb7887..662fe7d637d 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRealm.java @@ -46,8 +46,8 @@ import org.keycloak.models.OAuth2DeviceConfig; import org.keycloak.models.OTPPolicy; import org.keycloak.models.ParConfig; import org.keycloak.models.PasswordPolicy; -import org.keycloak.models.RequiredActionConfigModel; import org.keycloak.models.RealmModel; +import org.keycloak.models.RequiredActionConfigModel; import org.keycloak.models.RequiredActionProviderModel; import org.keycloak.models.RequiredCredentialModel; import org.keycloak.models.WebAuthnPolicy; diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRole.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRole.java index 49551edb41a..fe2c14802bf 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRole.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedRole.java @@ -17,6 +17,11 @@ package org.keycloak.models.cache.infinispan.entities; +import java.util.HashSet; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -24,11 +29,6 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.cache.infinispan.DefaultLazyLoader; import org.keycloak.models.cache.infinispan.LazyLoader; -import java.util.HashSet; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUser.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUser.java index 064bfae2a6a..619fbf301ec 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUser.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUser.java @@ -17,6 +17,14 @@ package org.keycloak.models.cache.infinispan.entities; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.credential.CredentialModel; import org.keycloak.models.GroupModel; @@ -27,14 +35,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.cache.infinispan.DefaultLazyLoader; import org.keycloak.models.cache.infinispan.LazyLoader; -import java.util.Collections; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.function.Supplier; -import java.util.stream.Collectors; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java index 669f35bb6db..c1387cab7ea 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsent.java @@ -17,12 +17,12 @@ package org.keycloak.models.cache.infinispan.entities; -import org.keycloak.models.ClientScopeModel; -import org.keycloak.models.UserConsentModel; - import java.util.HashSet; import java.util.Set; +import org.keycloak.models.ClientScopeModel; +import org.keycloak.models.UserConsentModel; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsents.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsents.java index 5d1d31e7402..60211ef4d9f 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsents.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/CachedUserConsents.java @@ -16,11 +16,11 @@ */ package org.keycloak.models.cache.infinispan.entities; -import org.keycloak.models.RealmModel; - import java.util.HashMap; import java.util.List; +import org.keycloak.models.RealmModel; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientListQuery.java index 1cb18c42cf4..72c8ac889a4 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientListQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientListQuery.java @@ -1,10 +1,10 @@ package org.keycloak.models.cache.infinispan.entities; -import org.keycloak.models.RealmModel; - import java.util.HashSet; import java.util.Set; +import org.keycloak.models.RealmModel; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientScopeListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientScopeListQuery.java index 9413bcfeaa4..c56cd5ce78c 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientScopeListQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/ClientScopeListQuery.java @@ -17,10 +17,10 @@ package org.keycloak.models.cache.infinispan.entities; -import org.keycloak.models.RealmModel; - import java.util.Set; +import org.keycloak.models.RealmModel; + public class ClientScopeListQuery extends AbstractRevisioned implements ClientScopeQuery { private final Set clientScopes; private final String realm; diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupListQuery.java index 0a3fcc47c8a..bfc0eee65cd 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupListQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupListQuery.java @@ -1,13 +1,13 @@ package org.keycloak.models.cache.infinispan.entities; -import org.keycloak.models.RealmModel; - import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.models.RealmModel; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleByNameQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleByNameQuery.java index b5b5d664056..0b9470e4f28 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleByNameQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleByNameQuery.java @@ -16,10 +16,10 @@ */ package org.keycloak.models.cache.infinispan.entities; -import org.keycloak.models.RealmModel; - import java.util.Set; +import org.keycloak.models.RealmModel; + /** * @author Alexander Schwartz * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleListQuery.java index 1affc90a508..7800934669e 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleListQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/RoleListQuery.java @@ -1,10 +1,10 @@ package org.keycloak.models.cache.infinispan.entities; -import org.keycloak.models.RealmModel; - import java.util.HashSet; import java.util.Set; +import org.keycloak.models.RealmModel; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/UserListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/UserListQuery.java index 7dd59ff305e..6f06fd8e670 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/UserListQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/UserListQuery.java @@ -1,10 +1,10 @@ package org.keycloak.models.cache.infinispan.entities; -import org.keycloak.models.RealmModel; - import java.util.HashSet; import java.util.Set; +import org.keycloak.models.RealmModel; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/AuthenticationSessionAuthNoteUpdateEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/AuthenticationSessionAuthNoteUpdateEvent.java index 621b9b534a2..7436f8fec66 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/AuthenticationSessionAuthNoteUpdateEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/AuthenticationSessionAuthNoteUpdateEvent.java @@ -20,11 +20,12 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Objects; +import org.keycloak.cluster.ClusterEvent; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.cluster.ClusterEvent; -import org.keycloak.marshalling.Marshalling; /** * diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/CacheKeyInvalidatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/CacheKeyInvalidatedEvent.java index 1d20ca0d744..97d275154e7 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/CacheKeyInvalidatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/CacheKeyInvalidatedEvent.java @@ -19,12 +19,13 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.RealmCacheManager; import org.keycloak.models.cache.infinispan.UserCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + @ProtoTypeId(Marshalling.CACHE_KEY_INVALIDATION_EVENT) public class CacheKeyInvalidatedEvent extends InvalidationEvent implements RealmCacheInvalidationEvent, UserCacheInvalidationEvent { diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientAddedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientAddedEvent.java index 9195a4e0e73..b0c06279ef1 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientAddedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientAddedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.RealmCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientRemovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientRemovedEvent.java index 5951476ffb4..fabe908644a 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientRemovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientRemovedEvent.java @@ -22,14 +22,15 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.ClientModel; import org.keycloak.models.RoleModel; import org.keycloak.models.cache.infinispan.RealmCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientScopeAddedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientScopeAddedEvent.java index d6a3629f45a..5b19b66be1a 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientScopeAddedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientScopeAddedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.RealmCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + @ProtoTypeId(Marshalling.CLIENT_SCOPE_ADDED_EVENT) public class ClientScopeAddedEvent extends BaseClientScopeEvent { diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientScopeRemovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientScopeRemovedEvent.java index e8ab31458f3..c188ffca703 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientScopeRemovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientScopeRemovedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.RealmCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + @ProtoTypeId(Marshalling.CLIENT_SCOPE_REMOVED_EVENT) public class ClientScopeRemovedEvent extends BaseClientScopeEvent { diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientUpdatedEvent.java index eef30622f93..254e4cbf376 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/ClientUpdatedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.cache.infinispan.RealmCacheManager; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.models.cache.infinispan.RealmCacheManager; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupAddedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupAddedEvent.java index 2eedcbcc12f..23c4aa0eff6 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupAddedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupAddedEvent.java @@ -20,11 +20,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Objects; import java.util.Set; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.cache.infinispan.RealmCacheManager; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.models.cache.infinispan.RealmCacheManager; /** * diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupMovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupMovedEvent.java index adbaba06d9c..2934e927810 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupMovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupMovedEvent.java @@ -20,13 +20,14 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Objects; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.GroupModel; import org.keycloak.models.cache.infinispan.RealmCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupRemovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupRemovedEvent.java index 1fc0b41d6d1..ffb5a982a22 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupRemovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupRemovedEvent.java @@ -20,13 +20,14 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Objects; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.GroupModel; import org.keycloak.models.cache.infinispan.RealmCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupUpdatedEvent.java index 27e4375da6a..818b3048fb9 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/GroupUpdatedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.RealmCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/InvalidationEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/InvalidationEvent.java index 64478e41466..83d798411db 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/InvalidationEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/InvalidationEvent.java @@ -19,9 +19,10 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Objects; -import org.infinispan.protostream.annotations.ProtoField; import org.keycloak.cluster.ClusterEvent; +import org.infinispan.protostream.annotations.ProtoField; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RealmRemovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RealmRemovedEvent.java index 6bb0700fd6a..c1f32363295 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RealmRemovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RealmRemovedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.RealmCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RealmUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RealmUpdatedEvent.java index 1130d4fa142..d744464548d 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RealmUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RealmUpdatedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.RealmCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleAddedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleAddedEvent.java index 5b397835b78..eee3289715a 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleAddedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleAddedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.cache.infinispan.RealmCacheManager; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.models.cache.infinispan.RealmCacheManager; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleRemovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleRemovedEvent.java index d4c861633c7..5df55184f33 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleRemovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleRemovedEvent.java @@ -20,11 +20,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Objects; import java.util.Set; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.cache.infinispan.RealmCacheManager; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.models.cache.infinispan.RealmCacheManager; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleUpdatedEvent.java index 58036176406..14c47ceb82b 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/RoleUpdatedEvent.java @@ -20,11 +20,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Objects; import java.util.Set; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.cache.infinispan.RealmCacheManager; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.models.cache.infinispan.RealmCacheManager; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserCacheRealmInvalidationEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserCacheRealmInvalidationEvent.java index f5550ccb35d..754868cbccd 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserCacheRealmInvalidationEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserCacheRealmInvalidationEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.UserCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserConsentsUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserConsentsUpdatedEvent.java index dfa341d24ac..14f7d0f3390 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserConsentsUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserConsentsUpdatedEvent.java @@ -19,11 +19,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.UserCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFederationLinkRemovedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFederationLinkRemovedEvent.java index 993b6af3fbc..1f40402c4c1 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFederationLinkRemovedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFederationLinkRemovedEvent.java @@ -20,13 +20,14 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Objects; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.FederatedIdentityModel; import org.keycloak.models.cache.infinispan.UserCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFederationLinkUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFederationLinkUpdatedEvent.java index ed4954f1a93..5192be870e7 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFederationLinkUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFederationLinkUpdatedEvent.java @@ -18,11 +18,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Set; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.UserCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFullInvalidationEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFullInvalidationEvent.java index 34769a8b2ca..9516f067b13 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFullInvalidationEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserFullInvalidationEvent.java @@ -24,13 +24,14 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.FederatedIdentityModel; import org.keycloak.models.cache.infinispan.UserCacheManager; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * Used when user added/removed * diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserUpdatedEvent.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserUpdatedEvent.java index 41bb8b330b7..eadbacbe4c1 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserUpdatedEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/events/UserUpdatedEvent.java @@ -20,11 +20,12 @@ package org.keycloak.models.cache.infinispan.events; import java.util.Objects; import java.util.Set; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.cache.infinispan.UserCacheManager; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.models.cache.infinispan.UserCacheManager; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/idp/IdentityProviderListQuery.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/idp/IdentityProviderListQuery.java index 207b360939b..4c0233c156c 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/idp/IdentityProviderListQuery.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/idp/IdentityProviderListQuery.java @@ -17,14 +17,14 @@ package org.keycloak.models.cache.infinispan.idp; -import org.keycloak.models.RealmModel; -import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned; -import org.keycloak.models.cache.infinispan.entities.InRealm; - import java.util.HashMap; import java.util.Map; import java.util.Set; +import org.keycloak.models.RealmModel; +import org.keycloak.models.cache.infinispan.entities.AbstractRevisioned; +import org.keycloak.models.cache.infinispan.entities.InRealm; + public class IdentityProviderListQuery extends AbstractRevisioned implements InRealm { private final String realmId; private final Map> searchKeys; diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/idp/InfinispanIdentityProviderStorageProvider.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/idp/InfinispanIdentityProviderStorageProvider.java index de831a6cc51..4e3f614b802 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/idp/InfinispanIdentityProviderStorageProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/idp/InfinispanIdentityProviderStorageProvider.java @@ -24,11 +24,11 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.keycloak.models.IdentityProviderQuery; import org.keycloak.common.Profile; import org.keycloak.models.IdentityProviderMapperModel; -import org.keycloak.models.IdentityProviderStorageProvider; import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderQuery; +import org.keycloak.models.IdentityProviderStorageProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelException; import org.keycloak.models.OrganizationModel; diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/CachedOrganization.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/CachedOrganization.java index c22aa7f2f74..9f932c01f6a 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/CachedOrganization.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/CachedOrganization.java @@ -20,6 +20,7 @@ import java.util.Set; import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProvider.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProvider.java index e0fc5d64d6d..5f3e4c17eaa 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProvider.java @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.stream.Stream; + import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.OrganizationDomainModel; diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProviderFactory.java index 646db79c6ac..a8ef58c2c19 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/InfinispanOrganizationProviderFactory.java @@ -21,10 +21,10 @@ import org.keycloak.Config.Scope; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.OrganizationModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.organization.OrganizationProvider; -import org.keycloak.models.OrganizationModel; import org.keycloak.organization.OrganizationProviderFactory; public class InfinispanOrganizationProviderFactory implements OrganizationProviderFactory { diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/OrganizationAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/OrganizationAdapter.java index 4c56870fef7..05289f107f7 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/OrganizationAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/organization/OrganizationAdapter.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Set; import java.util.function.Supplier; import java.util.stream.Stream; + import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.OrganizationDomainModel; diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/GroupListPredicate.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/GroupListPredicate.java index ed39b5a9d41..818447ca694 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/GroupListPredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/GroupListPredicate.java @@ -3,12 +3,13 @@ package org.keycloak.models.cache.infinispan.stream; import java.util.Map; import java.util.function.Predicate; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.entities.GroupListQuery; import org.keycloak.models.cache.infinispan.entities.Revisioned; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/HasRolePredicate.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/HasRolePredicate.java index ca1730ff609..bf8809a7eed 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/HasRolePredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/HasRolePredicate.java @@ -1,17 +1,18 @@ package org.keycloak.models.cache.infinispan.stream; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; +import java.util.Map; +import java.util.function.Predicate; + +import org.keycloak.marshalling.Marshalling; import org.keycloak.models.cache.infinispan.entities.CachedClient; import org.keycloak.models.cache.infinispan.entities.CachedClientScope; import org.keycloak.models.cache.infinispan.entities.CachedGroup; import org.keycloak.models.cache.infinispan.entities.CachedRole; import org.keycloak.models.cache.infinispan.entities.Revisioned; import org.keycloak.models.cache.infinispan.entities.RoleQuery; -import org.keycloak.marshalling.Marshalling; -import java.util.Map; -import java.util.function.Predicate; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; /** * @author Bill Burke diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InClientPredicate.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InClientPredicate.java index 60924ba8668..b38d2b8bcfa 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InClientPredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InClientPredicate.java @@ -1,14 +1,15 @@ package org.keycloak.models.cache.infinispan.stream; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.models.cache.infinispan.entities.InClient; -import org.keycloak.models.cache.infinispan.entities.Revisioned; -import org.keycloak.marshalling.Marshalling; - import java.util.Map; import java.util.function.Predicate; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.cache.infinispan.entities.InClient; +import org.keycloak.models.cache.infinispan.entities.Revisioned; + +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InGroupPredicate.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InGroupPredicate.java index 631729ea31a..3c7c0a54e5c 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InGroupPredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InGroupPredicate.java @@ -17,15 +17,16 @@ package org.keycloak.models.cache.infinispan.stream; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.models.cache.infinispan.entities.GroupNameQuery; -import org.keycloak.models.cache.infinispan.entities.Revisioned; -import org.keycloak.marshalling.Marshalling; - import java.util.Map; import java.util.function.Predicate; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.cache.infinispan.entities.GroupNameQuery; +import org.keycloak.models.cache.infinispan.entities.Revisioned; + +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + @ProtoTypeId(Marshalling.IN_GROUP_PREDICATE) public class InGroupPredicate implements Predicate> { private String group; diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InIdentityProviderPredicate.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InIdentityProviderPredicate.java index 617409323bf..51944216296 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InIdentityProviderPredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InIdentityProviderPredicate.java @@ -1,14 +1,15 @@ package org.keycloak.models.cache.infinispan.stream; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.models.cache.infinispan.entities.InIdentityProvider; -import org.keycloak.models.cache.infinispan.entities.Revisioned; -import org.keycloak.marshalling.Marshalling; - import java.util.Map; import java.util.function.Predicate; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.cache.infinispan.entities.InIdentityProvider; +import org.keycloak.models.cache.infinispan.entities.Revisioned; + +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Pedro Igor */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InRealmPredicate.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InRealmPredicate.java index 68f9686d8c4..077d5ba3406 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InRealmPredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InRealmPredicate.java @@ -1,14 +1,15 @@ package org.keycloak.models.cache.infinispan.stream; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.models.cache.infinispan.entities.InRealm; -import org.keycloak.models.cache.infinispan.entities.Revisioned; -import org.keycloak.marshalling.Marshalling; - import java.util.Map; import java.util.function.Predicate; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.cache.infinispan.entities.InRealm; +import org.keycloak.models.cache.infinispan.entities.Revisioned; + +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/AuthenticationSessionAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/AuthenticationSessionAdapter.java index 2cb16ed2c83..53847a8d7ff 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/AuthenticationSessionAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/AuthenticationSessionAdapter.java @@ -17,6 +17,12 @@ package org.keycloak.models.sessions.infinispan; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; import org.keycloak.models.ClientModel; @@ -28,12 +34,6 @@ import org.keycloak.models.sessions.infinispan.entities.AuthenticationSessionEnt import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; - import static org.keycloak.models.Constants.SESSION_NOTE_LIGHTWEIGHT_USER; import static org.keycloak.models.light.LightweightUserAdapter.isLightweightUser; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanAuthenticationSessionProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanAuthenticationSessionProvider.java index 3e9d58b2287..c9bd7bb7357 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanAuthenticationSessionProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanAuthenticationSessionProvider.java @@ -20,10 +20,6 @@ package org.keycloak.models.sessions.infinispan; import java.util.Iterator; import java.util.Map; -import org.infinispan.Cache; -import org.infinispan.commons.util.concurrent.CompletionStages; -import org.infinispan.factories.ComponentRegistry; -import org.infinispan.persistence.manager.PersistenceManager; import org.keycloak.cluster.ClusterProvider; import org.keycloak.common.util.Time; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; @@ -44,6 +40,11 @@ import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionProvider; import org.keycloak.sessions.RootAuthenticationSessionModel; +import org.infinispan.Cache; +import org.infinispan.commons.util.concurrent.CompletionStages; +import org.infinispan.factories.ComponentRegistry; +import org.infinispan.persistence.manager.PersistenceManager; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.AUTHENTICATION_SESSIONS_CACHE_NAME; /** diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanAuthenticationSessionProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanAuthenticationSessionProviderFactory.java index f5038ee2d60..812c0e4a3ca 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanAuthenticationSessionProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanAuthenticationSessionProviderFactory.java @@ -23,7 +23,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterProvider; @@ -53,6 +52,8 @@ import org.keycloak.provider.ProviderEvent; import org.keycloak.provider.ProviderEventListener; import org.keycloak.sessions.AuthenticationSessionProviderFactory; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.AUTHENTICATION_SESSIONS_CACHE_NAME; /** diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanKeycloakTransaction.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanKeycloakTransaction.java index 8c5712fa6b5..cdb21c3d1d1 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanKeycloakTransaction.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanKeycloakTransaction.java @@ -16,20 +16,20 @@ */ package org.keycloak.models.sessions.infinispan; -import org.infinispan.commons.api.BasicCache; -import org.infinispan.commons.util.concurrent.AggregateCompletionStage; -import org.infinispan.context.Flag; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import org.infinispan.Cache; -import org.jboss.logging.Logger; import org.keycloak.models.sessions.infinispan.transaction.DatabaseUpdate; import org.keycloak.models.sessions.infinispan.transaction.NonBlockingTransaction; +import org.infinispan.Cache; +import org.infinispan.commons.api.BasicCache; +import org.infinispan.commons.util.concurrent.AggregateCompletionStage; +import org.infinispan.context.Flag; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanSingleUseObjectProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanSingleUseObjectProvider.java index a24a478d938..398e5b894c9 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanSingleUseObjectProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanSingleUseObjectProvider.java @@ -20,9 +20,6 @@ package org.keycloak.models.sessions.infinispan; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.infinispan.client.hotrod.exceptions.HotRodClientException; -import org.infinispan.commons.api.BasicCache; -import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelException; @@ -30,6 +27,10 @@ import org.keycloak.models.SingleUseObjectProvider; import org.keycloak.models.session.RevokedTokenPersisterProvider; import org.keycloak.models.sessions.infinispan.entities.SingleUseObjectValueEntity; +import org.infinispan.client.hotrod.exceptions.HotRodClientException; +import org.infinispan.commons.api.BasicCache; +import org.jboss.logging.Logger; + /** * TODO: Check if Boolean can be used as single-use cache argument instead of SingleUseObjectValueEntity. With respect to other single-use cache usecases like "Revoke Refresh Token" . * Also with respect to the usage of streams iterating over "actionTokens" cache (check there are no ClassCastExceptions when casting values directly to SingleUseObjectValueEntity) diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanSingleUseObjectProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanSingleUseObjectProviderFactory.java index 0726e457049..57e8d332bcc 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanSingleUseObjectProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanSingleUseObjectProviderFactory.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.infinispan.commons.api.BasicCache; import org.keycloak.Config; import org.keycloak.common.util.Time; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; @@ -44,6 +43,8 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ServerInfoAwareProviderFactory; +import org.infinispan.commons.api.BasicCache; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.ACTION_TOKEN_CACHE; import static org.keycloak.storage.datastore.DefaultDatastoreProviderFactory.setupClearExpiredRevokedTokensScheduledTask; @@ -173,4 +174,3 @@ public class InfinispanSingleUseObjectProviderFactory implements SingleUseObject } } - diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProviderFactory.java index 740e7f3aba0..fabbc3a7da4 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanStickySessionEncoderProviderFactory.java @@ -21,10 +21,6 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import org.infinispan.Cache; -import org.infinispan.remoting.transport.jgroups.JGroupsAddress; -import org.jboss.logging.Logger; -import org.jgroups.util.NameCache; import org.keycloak.Config; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.infinispan.util.InfinispanUtils; @@ -37,6 +33,11 @@ import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.sessions.StickySessionEncoderProvider; import org.keycloak.sessions.StickySessionEncoderProviderFactory; +import org.infinispan.Cache; +import org.infinispan.remoting.transport.jgroups.JGroupsAddress; +import org.jboss.logging.Logger; +import org.jgroups.util.NameCache; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.AUTHENTICATION_SESSIONS_CACHE_NAME; /** diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserLoginFailureProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserLoginFailureProvider.java index 02f945ffa41..aeafc14a5f4 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserLoginFailureProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserLoginFailureProvider.java @@ -16,12 +16,12 @@ */ package org.keycloak.models.sessions.infinispan; -import org.infinispan.Cache; -import org.jboss.logging.Logger; +import java.util.concurrent.Future; + import org.keycloak.models.KeycloakSession; -import org.keycloak.models.UserLoginFailureProvider; import org.keycloak.models.RealmModel; import org.keycloak.models.UserLoginFailureModel; +import org.keycloak.models.UserLoginFailureProvider; import org.keycloak.models.UserSessionModel; import org.keycloak.models.sessions.infinispan.changes.InfinispanChangelogBasedTransaction; import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; @@ -35,7 +35,8 @@ import org.keycloak.models.sessions.infinispan.stream.Mappers; import org.keycloak.models.sessions.infinispan.stream.SessionWrapperPredicate; import org.keycloak.models.sessions.infinispan.util.FuturesHelper; -import java.util.concurrent.Future; +import org.infinispan.Cache; +import org.jboss.logging.Logger; import static org.keycloak.common.util.StackUtil.getShortStackTrace; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserLoginFailureProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserLoginFailureProviderFactory.java index b67af957dd9..33a3204e515 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserLoginFailureProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserLoginFailureProviderFactory.java @@ -18,7 +18,6 @@ package org.keycloak.models.sessions.infinispan; import java.util.Set; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.cluster.ClusterProvider; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; @@ -45,6 +44,8 @@ import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderEvent; import org.keycloak.provider.ProviderEventListener; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.LOGIN_FAILURE_CACHE_NAME; /** diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java index c069ad8bcb7..5c4a402af67 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProvider.java @@ -34,11 +34,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import org.infinispan.Cache; -import org.infinispan.commons.api.AsyncCache; -import org.infinispan.commons.util.concurrent.CompletionStages; -import org.infinispan.stream.CacheCollectors; -import org.jboss.logging.Logger; import org.keycloak.cluster.ClusterProvider; import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; @@ -78,6 +73,12 @@ import org.keycloak.models.sessions.infinispan.util.FuturesHelper; import org.keycloak.models.sessions.infinispan.util.SessionTimeouts; import org.keycloak.utils.StreamsUtil; +import org.infinispan.Cache; +import org.infinispan.commons.api.AsyncCache; +import org.infinispan.commons.util.concurrent.CompletionStages; +import org.infinispan.stream.CacheCollectors; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_USER_SESSION_CACHE_NAME; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProviderFactory.java index 9712748ec10..53498ae08ce 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/InfinispanUserSessionProviderFactory.java @@ -24,7 +24,6 @@ import java.util.Set; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.cluster.ClusterProvider; import org.keycloak.common.util.MultiSiteUtils; @@ -65,6 +64,8 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ServerInfoAwareProviderFactory; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_USER_SESSION_CACHE_NAME; @@ -414,4 +415,3 @@ public class InfinispanUserSessionProviderFactory implements UserSessionProvider private record PersistentTransaction(UserSessionPersistentChangelogBasedTransaction userTx, ClientSessionPersistentChangelogBasedTransaction clientTx) {} } - diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/PersistentUserSessionProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/PersistentUserSessionProvider.java index e6da21c3320..c52d25ded0e 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/PersistentUserSessionProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/PersistentUserSessionProvider.java @@ -31,17 +31,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import io.reactivex.rxjava3.core.Flowable; -import org.infinispan.Cache; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.client.hotrod.exceptions.HotRodClientException; -import org.infinispan.commons.api.AsyncCache; -import org.infinispan.commons.api.BasicCache; -import org.infinispan.commons.util.ByRef; -import org.infinispan.commons.util.concurrent.CompletionStages; -import org.infinispan.factories.ComponentRegistry; -import org.infinispan.persistence.manager.PersistenceManager; -import org.jboss.logging.Logger; import org.keycloak.cluster.ClusterProvider; import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; @@ -89,6 +78,18 @@ import org.keycloak.models.sessions.infinispan.util.SessionTimeouts; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.UserModelDelegate; +import io.reactivex.rxjava3.core.Flowable; +import org.infinispan.Cache; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.client.hotrod.exceptions.HotRodClientException; +import org.infinispan.commons.api.AsyncCache; +import org.infinispan.commons.api.BasicCache; +import org.infinispan.commons.util.ByRef; +import org.infinispan.commons.util.concurrent.CompletionStages; +import org.infinispan.factories.ComponentRegistry; +import org.infinispan.persistence.manager.PersistenceManager; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_USER_SESSION_CACHE_NAME; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/RootAuthenticationSessionAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/RootAuthenticationSessionAdapter.java index 8b65af02272..6c5fd95e89f 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/RootAuthenticationSessionAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/RootAuthenticationSessionAdapter.java @@ -17,7 +17,11 @@ package org.keycloak.models.sessions.infinispan; -import org.jboss.logging.Logger; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.SecretGenerator; import org.keycloak.common.util.Time; @@ -30,10 +34,7 @@ import org.keycloak.models.sessions.infinispan.entities.RootAuthenticationSessio import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java index 0708ab92a82..4c901448490 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/UserSessionAdapter.java @@ -17,7 +17,13 @@ package org.keycloak.models.sessions.infinispan; -import org.jboss.logging.Logger; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; @@ -33,12 +39,7 @@ import org.keycloak.models.sessions.infinispan.entities.AuthenticatedClientSessi import org.keycloak.models.sessions.infinispan.entities.EmbeddedClientSessionKey; import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/CacheHolder.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/CacheHolder.java index 097d8d07fe0..32337d0e793 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/CacheHolder.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/CacheHolder.java @@ -19,11 +19,12 @@ package org.keycloak.models.sessions.infinispan.changes; import java.util.function.Supplier; -import org.infinispan.Cache; -import org.infinispan.util.concurrent.ActionSequencer; import org.keycloak.models.sessions.infinispan.SessionFunction; import org.keycloak.models.sessions.infinispan.entities.SessionEntity; +import org.infinispan.Cache; +import org.infinispan.util.concurrent.ActionSequencer; + /** * Groups the {@link Cache}, the {@link ActionSequencer} (used by replace method) and the {@link SessionFunction} to * compute the lifespan, and the max-idle for this session entity. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/ClientSessionPersistentChangelogBasedTransaction.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/ClientSessionPersistentChangelogBasedTransaction.java index 8cd4f3cd43e..70b8dcd3218 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/ClientSessionPersistentChangelogBasedTransaction.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/ClientSessionPersistentChangelogBasedTransaction.java @@ -17,8 +17,11 @@ package org.keycloak.models.sessions.infinispan.changes; -import org.infinispan.Cache; -import org.jboss.logging.Logger; +import java.util.Collection; +import java.util.Objects; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ConcurrentHashMap; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -30,10 +33,8 @@ import org.keycloak.models.sessions.infinispan.entities.AuthenticatedClientSessi import org.keycloak.models.sessions.infinispan.entities.EmbeddedClientSessionKey; import org.keycloak.models.sessions.infinispan.util.SessionTimeouts; -import java.util.Collection; -import java.util.Objects; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ConcurrentHashMap; +import org.infinispan.Cache; +import org.jboss.logging.Logger; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/InfinispanChangelogBasedTransaction.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/InfinispanChangelogBasedTransaction.java index a22d26f58c8..4baeb28b577 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/InfinispanChangelogBasedTransaction.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/InfinispanChangelogBasedTransaction.java @@ -24,10 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import org.infinispan.Cache; -import org.infinispan.commons.util.concurrent.AggregateCompletionStage; -import org.infinispan.commons.util.concurrent.CompletionStages; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; @@ -37,6 +33,11 @@ import org.keycloak.models.sessions.infinispan.transaction.DatabaseUpdate; import org.keycloak.models.sessions.infinispan.transaction.NonBlockingTransaction; import org.keycloak.models.sessions.infinispan.util.SessionTimeouts; +import org.infinispan.Cache; +import org.infinispan.commons.util.concurrent.AggregateCompletionStage; +import org.infinispan.commons.util.concurrent.CompletionStages; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/InfinispanChangesUtils.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/InfinispanChangesUtils.java index 6a58b42c0ae..535a648f314 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/InfinispanChangesUtils.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/InfinispanChangesUtils.java @@ -22,6 +22,13 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; +import org.keycloak.connections.infinispan.InfinispanConnectionProvider; +import org.keycloak.connections.infinispan.InfinispanUtil; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.sessions.infinispan.CacheDecorators; +import org.keycloak.models.sessions.infinispan.SessionFunction; +import org.keycloak.models.sessions.infinispan.entities.SessionEntity; + import org.infinispan.Cache; import org.infinispan.affinity.KeyAffinityServiceFactory; import org.infinispan.commons.util.concurrent.AggregateCompletionStage; @@ -29,12 +36,6 @@ import org.infinispan.commons.util.concurrent.CompletableFutures; import org.infinispan.commons.util.concurrent.CompletionStages; import org.infinispan.util.concurrent.ActionSequencer; import org.jboss.logging.Logger; -import org.keycloak.connections.infinispan.InfinispanConnectionProvider; -import org.keycloak.connections.infinispan.InfinispanUtil; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.sessions.infinispan.CacheDecorators; -import org.keycloak.models.sessions.infinispan.SessionFunction; -import org.keycloak.models.sessions.infinispan.entities.SessionEntity; /** * Utility methods for embedded and change-log based transaction diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/JpaChangesPerformer.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/JpaChangesPerformer.java index a615cb83de5..e9318bea1d4 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/JpaChangesPerformer.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/JpaChangesPerformer.java @@ -17,9 +17,16 @@ package org.keycloak.models.sessions.infinispan.changes; -import org.infinispan.commons.util.concurrent.AggregateCompletionStage; -import org.infinispan.util.function.TriConsumer; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.CompletionStage; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -38,15 +45,9 @@ import org.keycloak.models.utils.RealmModelDelegate; import org.keycloak.models.utils.UserModelDelegate; import org.keycloak.models.utils.UserSessionModelDelegate; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.CompletionStage; +import org.infinispan.commons.util.concurrent.AggregateCompletionStage; +import org.infinispan.util.function.TriConsumer; +import org.jboss.logging.Logger; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_CLIENT_SESSION_CACHE_NAME; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/MergedUpdate.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/MergedUpdate.java index 90cfdb3c374..fcebc7c585b 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/MergedUpdate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/MergedUpdate.java @@ -20,10 +20,11 @@ package org.keycloak.models.sessions.infinispan.changes; import java.util.LinkedList; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.models.sessions.infinispan.entities.SessionEntity; import org.keycloak.models.sessions.infinispan.util.SessionTimeouts; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentSessionsChangelogBasedTransaction.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentSessionsChangelogBasedTransaction.java index d5c57babee6..57be741d74d 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentSessionsChangelogBasedTransaction.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentSessionsChangelogBasedTransaction.java @@ -17,10 +17,14 @@ package org.keycloak.models.sessions.infinispan.changes; -import org.infinispan.Cache; -import org.infinispan.commons.util.concurrent.AggregateCompletionStage; -import org.infinispan.commons.util.concurrent.CompletionStages; -import org.jboss.logging.Logger; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; +import java.util.stream.Stream; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; @@ -30,13 +34,10 @@ import org.keycloak.models.sessions.infinispan.transaction.DatabaseUpdate; import org.keycloak.models.sessions.infinispan.transaction.NonBlockingTransaction; import org.keycloak.models.sessions.infinispan.util.SessionTimeouts; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.TimeUnit; -import java.util.function.Consumer; -import java.util.stream.Stream; +import org.infinispan.Cache; +import org.infinispan.commons.util.concurrent.AggregateCompletionStage; +import org.infinispan.commons.util.concurrent.CompletionStages; +import org.jboss.logging.Logger; abstract public class PersistentSessionsChangelogBasedTransaction implements SessionsChangelogBasedTransaction, NonBlockingTransaction { diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentSessionsWorker.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentSessionsWorker.java index 9257706fd57..95ad5d58aab 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentSessionsWorker.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentSessionsWorker.java @@ -17,17 +17,6 @@ package org.keycloak.models.sessions.infinispan.changes; -import io.opentelemetry.api.trace.Span; -import io.opentelemetry.api.trace.SpanBuilder; -import io.opentelemetry.api.trace.Tracer; -import io.opentelemetry.context.Context; -import org.jboss.logging.Logger; -import org.keycloak.common.util.Retry; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.ModelDuplicateException; -import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.tracing.TracingProvider; - import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.ArrayList; @@ -36,6 +25,18 @@ import java.util.List; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; +import org.keycloak.common.util.Retry; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.ModelDuplicateException; +import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.tracing.TracingProvider; + +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.api.trace.SpanBuilder; +import io.opentelemetry.api.trace.Tracer; +import io.opentelemetry.context.Context; +import org.jboss.logging.Logger; + /** * Run one thread per session type and drain the queues once there is an entry. Will batch entries if possible. * diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentUpdate.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentUpdate.java index 71102915fe6..ff55c92a255 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentUpdate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/PersistentUpdate.java @@ -17,12 +17,13 @@ package org.keycloak.models.sessions.infinispan.changes; -import io.opentelemetry.api.trace.Span; -import org.keycloak.models.KeycloakSession; - import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; +import org.keycloak.models.KeycloakSession; + +import io.opentelemetry.api.trace.Span; + /** * Capture information for a deferred update of the session stores. * diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/ReplaceFunction.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/ReplaceFunction.java index 58895e9b513..14cc359b485 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/ReplaceFunction.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/ReplaceFunction.java @@ -4,11 +4,12 @@ import java.util.Objects; import java.util.UUID; import java.util.function.BiFunction; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.sessions.infinispan.entities.SessionEntity; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.models.sessions.infinispan.entities.SessionEntity; /** * Performs an entity replacement in Infinispan, using its versions instead of equality. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SerializeExecutionsByKey.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SerializeExecutionsByKey.java index 31f3c07628a..2754f763778 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SerializeExecutionsByKey.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SerializeExecutionsByKey.java @@ -17,11 +17,11 @@ package org.keycloak.models.sessions.infinispan.changes; -import org.jboss.logging.Logger; - import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.ReentrantLock; +import org.jboss.logging.Logger; + /** * Adding an in-JVM lock to prevent a best-effort concurrent executions for the same ID. * This should prevent a burst of requests by letting only the first request pass, and then the others will follow one-by-one. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SessionEntityWrapper.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SessionEntityWrapper.java index e3c14877212..a20e45637a1 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SessionEntityWrapper.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/SessionEntityWrapper.java @@ -17,21 +17,22 @@ package org.keycloak.models.sessions.infinispan.changes; -import org.infinispan.protostream.WrappedMessage; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.models.ClientModel; -import org.keycloak.models.RealmModel; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.models.sessions.infinispan.entities.AuthenticatedClientSessionEntity; -import org.keycloak.models.sessions.infinispan.entities.SessionEntity; - import java.util.Map; import java.util.Objects; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.ClientModel; +import org.keycloak.models.RealmModel; +import org.keycloak.models.sessions.infinispan.entities.AuthenticatedClientSessionEntity; +import org.keycloak.models.sessions.infinispan.entities.SessionEntity; + +import org.infinispan.protostream.WrappedMessage; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/UserSessionPersistentChangelogBasedTransaction.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/UserSessionPersistentChangelogBasedTransaction.java index 878a9ba7360..fb26ea72e14 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/UserSessionPersistentChangelogBasedTransaction.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/UserSessionPersistentChangelogBasedTransaction.java @@ -17,8 +17,8 @@ package org.keycloak.models.sessions.infinispan.changes; -import org.infinispan.Cache; -import org.jboss.logging.Logger; +import java.util.concurrent.ArrayBlockingQueue; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; @@ -28,7 +28,8 @@ import org.keycloak.models.sessions.infinispan.PersistentUserSessionProvider; import org.keycloak.models.sessions.infinispan.entities.SessionEntity; import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; -import java.util.concurrent.ArrayBlockingQueue; +import org.infinispan.Cache; +import org.jboss.logging.Logger; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.USER_SESSION_CACHE_NAME; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/ConditionalRemover.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/ConditionalRemover.java index 5efa0f05977..6ed2ce6ffc1 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/ConditionalRemover.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/ConditionalRemover.java @@ -17,11 +17,12 @@ package org.keycloak.models.sessions.infinispan.changes.remote.remover; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.commons.util.concurrent.AggregateCompletionStage; import org.keycloak.models.sessions.infinispan.changes.remote.updater.Updater; import org.keycloak.models.sessions.infinispan.remote.transaction.RemoteChangeLogTransaction; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.commons.util.concurrent.AggregateCompletionStage; + /** * It handles conditional remove operations. *

diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/query/ByRealmIdQueryConditionalRemover.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/query/ByRealmIdQueryConditionalRemover.java index 72138ef4368..fbd61ea9564 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/query/ByRealmIdQueryConditionalRemover.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/query/ByRealmIdQueryConditionalRemover.java @@ -24,10 +24,11 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.infinispan.client.hotrod.RemoteCache; import org.keycloak.models.sessions.infinispan.changes.remote.remover.ConditionalRemover; import org.keycloak.models.sessions.infinispan.entities.SessionEntity; +import org.infinispan.client.hotrod.RemoteCache; + /** * A {@link ConditionalRemover} implementation to delete {@link SessionEntity} based on the {@code realmId} value. *

diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/query/QueryBasedConditionalRemover.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/query/QueryBasedConditionalRemover.java index 88fc677e1fc..7bc2a270061 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/query/QueryBasedConditionalRemover.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/remover/query/QueryBasedConditionalRemover.java @@ -21,11 +21,12 @@ import java.lang.invoke.MethodHandles; import java.util.Map; import java.util.concurrent.CompletionStage; +import org.keycloak.models.sessions.infinispan.changes.remote.remover.ConditionalRemover; + import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.impl.query.RemoteQuery; import org.infinispan.commons.util.concurrent.AggregateCompletionStage; import org.jboss.logging.Logger; -import org.keycloak.models.sessions.infinispan.changes.remote.remover.ConditionalRemover; /** * An implementation of {@link ConditionalRemover} that uses the delete statement to remove entries from a diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/updater/authsession/RootAuthenticationSessionUpdater.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/updater/authsession/RootAuthenticationSessionUpdater.java index 5725efaf2f8..9dc43afbc60 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/updater/authsession/RootAuthenticationSessionUpdater.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/updater/authsession/RootAuthenticationSessionUpdater.java @@ -16,6 +16,14 @@ */ package org.keycloak.models.sessions.infinispan.changes.remote.updater.authsession; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.Consumer; + import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.SecretGenerator; import org.keycloak.common.util.Time; @@ -32,14 +40,6 @@ import org.keycloak.models.sessions.infinispan.util.SessionTimeouts; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Consumer; - public class RootAuthenticationSessionUpdater extends BaseUpdater implements RootAuthenticationSessionModel { private final static Comparator> TIMESTAMP_COMPARATOR = diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/updater/client/AuthenticatedClientSessionUpdater.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/updater/client/AuthenticatedClientSessionUpdater.java index 0b4e0c94cb1..b226d633831 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/updater/client/AuthenticatedClientSessionUpdater.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/remote/updater/client/AuthenticatedClientSessionUpdater.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Objects; import java.util.function.Consumer; -import org.infinispan.client.hotrod.RemoteCache; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; @@ -39,6 +38,8 @@ import org.keycloak.models.sessions.infinispan.entities.RemoteAuthenticatedClien import org.keycloak.models.sessions.infinispan.remote.transaction.ClientSessionChangeLogTransaction; import org.keycloak.models.sessions.infinispan.util.SessionTimeouts; +import org.infinispan.client.hotrod.RemoteCache; + /** * An {@link Updater} implementation that keeps track of {@link AuthenticatedClientSessionModel} changes. */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/PersisterLastSessionRefreshStore.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/PersisterLastSessionRefreshStore.java index d89b6bfdf63..3d2d11808ed 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/PersisterLastSessionRefreshStore.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/PersisterLastSessionRefreshStore.java @@ -22,7 +22,6 @@ import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -30,6 +29,8 @@ import org.keycloak.models.session.UserSessionPersisterProvider; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.SessionTimeoutHelper; +import org.jboss.logging.Logger; + /** * The store is supposed to do periodic bulk update of lastSessionRefresh times of all userSessions, which were refreshed during some period * of time. The updates are sent to UserSessionPersisterProvider (DB) diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/SessionData.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/SessionData.java index 0aacdbae3be..d15d216f66a 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/SessionData.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/changes/sessions/SessionData.java @@ -17,9 +17,10 @@ package org.keycloak.models.sessions.infinispan.changes.sessions; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.protostream.annotations.Proto; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticatedClientSessionEntity.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticatedClientSessionEntity.java index 24ea0776208..c4bd612c427 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticatedClientSessionEntity.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticatedClientSessionEntity.java @@ -21,10 +21,6 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoReserved; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.common.util.Time; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.AuthenticatedClientSessionModel; @@ -32,6 +28,11 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoReserved; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticatedClientSessionStore.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticatedClientSessionStore.java index 0f87aabc1db..0e090035d3f 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticatedClientSessionStore.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticatedClientSessionStore.java @@ -16,17 +16,18 @@ */ package org.keycloak.models.sessions.infinispan.entities; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; - import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.BiConsumer; +import org.keycloak.marshalling.Marshalling; + +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * * @author hmlnarik diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticationSessionEntity.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticationSessionEntity.java index 0e3ea65b25b..d4769e19624 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticationSessionEntity.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/AuthenticationSessionEntity.java @@ -17,16 +17,17 @@ package org.keycloak.models.sessions.infinispan.entities; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.sessions.AuthenticationSessionModel; - import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.sessions.AuthenticationSessionModel; + +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/ClientSessionKey.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/ClientSessionKey.java index 3203d7b40d0..e38aaab3380 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/ClientSessionKey.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/ClientSessionKey.java @@ -17,10 +17,11 @@ package org.keycloak.models.sessions.infinispan.entities; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.protostream.annotations.Proto; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; /** * The key stored in the {@link RemoteCache} for {@link RemoteAuthenticatedClientSessionEntity}. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/EmbeddedClientSessionKey.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/EmbeddedClientSessionKey.java index 2a2dd499f1a..c8bdf718985 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/EmbeddedClientSessionKey.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/EmbeddedClientSessionKey.java @@ -17,9 +17,10 @@ package org.keycloak.models.sessions.infinispan.entities; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.protostream.annotations.Proto; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; /** * The key stored in the {@link org.infinispan.Cache} for {@link AuthenticatedClientSessionEntity}. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/LoginFailureEntity.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/LoginFailureEntity.java index 47e0504b7e5..97aee10706f 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/LoginFailureEntity.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/LoginFailureEntity.java @@ -19,11 +19,12 @@ package org.keycloak.models.sessions.infinispan.entities; import java.util.Objects; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.api.annotations.indexing.Indexed; import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; /** * @author Stian Thorgersen diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/LoginFailureKey.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/LoginFailureKey.java index bcafcaeef23..8b61ba06840 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/LoginFailureKey.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/LoginFailureKey.java @@ -17,9 +17,10 @@ package org.keycloak.models.sessions.infinispan.entities; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.protostream.annotations.Proto; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; /** * @author Stian Thorgersen diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RemoteAuthenticatedClientSessionEntity.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RemoteAuthenticatedClientSessionEntity.java index a801eb5c06f..a7765983fc1 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RemoteAuthenticatedClientSessionEntity.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RemoteAuthenticatedClientSessionEntity.java @@ -23,15 +23,16 @@ import java.util.Map; import java.util.Objects; import java.util.UUID; +import org.keycloak.common.util.Time; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.AuthenticatedClientSessionModel; +import org.keycloak.models.UserSessionModel; + import org.infinispan.api.annotations.indexing.Basic; import org.infinispan.api.annotations.indexing.Indexed; import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.common.util.Time; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.models.AuthenticatedClientSessionModel; -import org.keycloak.models.UserSessionModel; @ProtoTypeId(Marshalling.REMOTE_CLIENT_SESSION_ENTITY) @Indexed diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RemoteUserSessionEntity.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RemoteUserSessionEntity.java index 93317e86a9a..9ceadd0ef01 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RemoteUserSessionEntity.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RemoteUserSessionEntity.java @@ -21,11 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import org.infinispan.api.annotations.indexing.Basic; -import org.infinispan.api.annotations.indexing.Indexed; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.common.util.Time; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.OfflineUserSessionModel; @@ -33,6 +28,12 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; +import org.infinispan.api.annotations.indexing.Basic; +import org.infinispan.api.annotations.indexing.Indexed; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + @ProtoTypeId(Marshalling.REMOTE_USER_SESSION_ENTITY) @Indexed public class RemoteUserSessionEntity { diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RootAuthenticationSessionEntity.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RootAuthenticationSessionEntity.java index 2a8446a667b..6423d1f1dac 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RootAuthenticationSessionEntity.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/RootAuthenticationSessionEntity.java @@ -17,15 +17,16 @@ package org.keycloak.models.sessions.infinispan.entities; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; + +import org.keycloak.marshalling.Marshalling; + import org.infinispan.api.annotations.indexing.Indexed; import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; - -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ConcurrentHashMap; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/SessionEntity.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/SessionEntity.java index c56d0c4d215..6981692c2a0 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/SessionEntity.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/SessionEntity.java @@ -17,11 +17,12 @@ package org.keycloak.models.sessions.infinispan.entities; -import org.infinispan.api.annotations.indexing.Basic; -import org.infinispan.protostream.annotations.ProtoField; import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; +import org.infinispan.api.annotations.indexing.Basic; +import org.infinispan.protostream.annotations.ProtoField; + /** * Represents an entity containing data about a session, i.e. an object that is stored in infinispan cache. * Due to conflict management in {@code InfinispanChangelogBasedTransaction} that use Infinispan's {@code replace()} diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/SingleUseObjectValueEntity.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/SingleUseObjectValueEntity.java index e612dd9f966..260bf9a7f56 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/SingleUseObjectValueEntity.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/SingleUseObjectValueEntity.java @@ -20,11 +20,12 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.SingleUseObjectValueModel; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.models.SingleUseObjectValueModel; /** * @author hmlnarik diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/UserSessionEntity.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/UserSessionEntity.java index 28410f96a86..aa041f6f3e2 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/UserSessionEntity.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/entities/UserSessionEntity.java @@ -23,11 +23,6 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoReserved; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.OfflineUserSessionModel; @@ -36,6 +31,12 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoReserved; +import org.infinispan.protostream.annotations.ProtoTypeId; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/AbstractAuthSessionClusterListener.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/AbstractAuthSessionClusterListener.java index 6a8999a0e5e..9b7f36d6da6 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/AbstractAuthSessionClusterListener.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/AbstractAuthSessionClusterListener.java @@ -17,7 +17,6 @@ package org.keycloak.models.sessions.infinispan.events; -import org.jboss.logging.Logger; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterListener; import org.keycloak.infinispan.util.InfinispanUtils; @@ -27,6 +26,8 @@ import org.keycloak.models.sessions.infinispan.InfinispanAuthenticationSessionPr import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.sessions.AuthenticationSessionProvider; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/AbstractUserSessionClusterListener.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/AbstractUserSessionClusterListener.java index b03fa52bc9c..598e4daef9a 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/AbstractUserSessionClusterListener.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/AbstractUserSessionClusterListener.java @@ -17,7 +17,6 @@ package org.keycloak.models.sessions.infinispan.events; -import org.jboss.logging.Logger; import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterListener; import org.keycloak.models.KeycloakSession; @@ -25,6 +24,8 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.Provider; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RealmRemovedSessionEvent.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RealmRemovedSessionEvent.java index 10f2cfb0634..02945b2995f 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RealmRemovedSessionEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RealmRemovedSessionEvent.java @@ -17,9 +17,10 @@ package org.keycloak.models.sessions.infinispan.events; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RemoveAllUserLoginFailuresEvent.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RemoveAllUserLoginFailuresEvent.java index 1903ca8c0a0..7150dd4028a 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RemoveAllUserLoginFailuresEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RemoveAllUserLoginFailuresEvent.java @@ -17,9 +17,10 @@ package org.keycloak.models.sessions.infinispan.events; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RemoveUserSessionsEvent.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RemoveUserSessionsEvent.java index 1a324c00031..76c87508411 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RemoveUserSessionsEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/RemoveUserSessionsEvent.java @@ -17,9 +17,10 @@ package org.keycloak.models.sessions.infinispan.events; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/SessionClusterEvent.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/SessionClusterEvent.java index b50d88df948..a716ed85f19 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/SessionClusterEvent.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/events/SessionClusterEvent.java @@ -19,13 +19,14 @@ package org.keycloak.models.sessions.infinispan.events; import java.util.Objects; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoReserved; import org.keycloak.cluster.ClusterEvent; import org.keycloak.connections.infinispan.InfinispanUtil; import org.keycloak.connections.infinispan.TopologyInfo; import org.keycloak.models.KeycloakSession; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoReserved; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/BaseUserSessionExpirationListener.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/BaseUserSessionExpirationListener.java index 4c2ceb8c6f4..9c9e6b43738 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/BaseUserSessionExpirationListener.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/BaseUserSessionExpirationListener.java @@ -19,8 +19,6 @@ package org.keycloak.models.sessions.infinispan.listeners; import java.lang.invoke.MethodHandles; -import org.infinispan.util.concurrent.BlockingManager; -import org.jboss.logging.Logger; import org.keycloak.events.Details; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; @@ -28,6 +26,9 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; +import org.infinispan.util.concurrent.BlockingManager; +import org.jboss.logging.Logger; + /** * Base class to handle expired user session. *

diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/EmbeddedUserSessionExpirationListener.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/EmbeddedUserSessionExpirationListener.java index 6ce27cab1c2..7d3cfff18d0 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/EmbeddedUserSessionExpirationListener.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/EmbeddedUserSessionExpirationListener.java @@ -17,13 +17,14 @@ package org.keycloak.models.sessions.infinispan.listeners; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; +import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; + import org.infinispan.notifications.Listener; import org.infinispan.notifications.cachelistener.annotation.CacheEntryExpired; import org.infinispan.notifications.cachelistener.event.CacheEntryExpiredEvent; import org.infinispan.util.concurrent.BlockingManager; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; -import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; /** * A listener for embedded Infinispan caches. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/RemoteUserSessionExpirationListener.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/RemoteUserSessionExpirationListener.java index ee759a74ab3..2b9c846bcba 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/RemoteUserSessionExpirationListener.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/listeners/RemoteUserSessionExpirationListener.java @@ -20,14 +20,15 @@ package org.keycloak.models.sessions.infinispan.listeners; import java.io.IOException; import java.nio.ByteBuffer; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.sessions.infinispan.entities.RemoteUserSessionEntity; + import org.infinispan.client.hotrod.annotation.ClientCacheEntryExpired; import org.infinispan.client.hotrod.annotation.ClientListener; import org.infinispan.client.hotrod.event.ClientCacheEntryCustomEvent; import org.infinispan.commons.io.UnsignedNumeric; import org.infinispan.commons.marshall.Marshaller; import org.infinispan.util.concurrent.BlockingManager; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.sessions.infinispan.entities.RemoteUserSessionEntity; /** * A listener for remote Infinispan caches. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/query/ClientSessionQueries.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/query/ClientSessionQueries.java index 282806919bc..6e9af6e047f 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/query/ClientSessionQueries.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/query/ClientSessionQueries.java @@ -17,12 +17,13 @@ package org.keycloak.models.sessions.infinispan.query; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.commons.api.query.Query; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.sessions.infinispan.entities.ClientSessionKey; import org.keycloak.models.sessions.infinispan.entities.RemoteAuthenticatedClientSessionEntity; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.commons.api.query.Query; + /** * Util class with Infinispan Ickle Queries for {@link RemoteAuthenticatedClientSessionEntity}. */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/query/UserSessionQueries.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/query/UserSessionQueries.java index 17c0b9db4ad..241531dafc9 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/query/UserSessionQueries.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/query/UserSessionQueries.java @@ -17,11 +17,12 @@ package org.keycloak.models.sessions.infinispan.query; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.commons.api.query.Query; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.sessions.infinispan.entities.RemoteUserSessionEntity; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.commons.api.query.Query; + /** * Util class with Infinispan Ickle Queries for {@link RemoteUserSessionEntity}. */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanAuthenticationSessionProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanAuthenticationSessionProviderFactory.java index 080a45d31f8..c95fbfd4428 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanAuthenticationSessionProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanAuthenticationSessionProviderFactory.java @@ -23,9 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.util.concurrent.BlockingManager; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.infinispan.util.InfinispanUtils; @@ -47,6 +44,10 @@ import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ServerInfoAwareProviderFactory; import org.keycloak.sessions.AuthenticationSessionProviderFactory; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.util.concurrent.BlockingManager; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.AUTHENTICATION_SESSIONS_CACHE_NAME; import static org.keycloak.models.sessions.infinispan.InfinispanAuthenticationSessionProviderFactory.DEFAULT_AUTH_SESSIONS_LIMIT; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanSingleUseObjectProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanSingleUseObjectProvider.java index 8cd34dcbc47..fb0e2075118 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanSingleUseObjectProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanSingleUseObjectProvider.java @@ -23,13 +23,14 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.TimeUnit; +import org.keycloak.models.SingleUseObjectProvider; +import org.keycloak.models.sessions.infinispan.entities.SingleUseObjectValueEntity; +import org.keycloak.models.sessions.infinispan.remote.transaction.SingleUseObjectTransaction; + import org.infinispan.client.hotrod.Flag; import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.client.hotrod.exceptions.HotRodClientException; import org.jboss.logging.Logger; -import org.keycloak.models.SingleUseObjectProvider; -import org.keycloak.models.sessions.infinispan.entities.SingleUseObjectValueEntity; -import org.keycloak.models.sessions.infinispan.remote.transaction.SingleUseObjectTransaction; public class RemoteInfinispanSingleUseObjectProvider implements SingleUseObjectProvider { diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanSingleUseObjectProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanSingleUseObjectProviderFactory.java index 15f2e8fea6c..fb702e2708c 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanSingleUseObjectProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteInfinispanSingleUseObjectProviderFactory.java @@ -24,10 +24,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import io.reactivex.rxjava3.core.Completable; -import io.reactivex.rxjava3.core.Flowable; -import org.infinispan.client.hotrod.RemoteCache; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.common.util.Time; import org.keycloak.infinispan.util.InfinispanUtils; @@ -48,6 +44,11 @@ import org.keycloak.provider.ProviderEvent; import org.keycloak.provider.ProviderEventListener; import org.keycloak.provider.ServerInfoAwareProviderFactory; +import io.reactivex.rxjava3.core.Completable; +import io.reactivex.rxjava3.core.Flowable; +import org.infinispan.client.hotrod.RemoteCache; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.ACTION_TOKEN_CACHE; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.getRemoteCache; import static org.keycloak.models.SingleUseObjectProvider.REVOKED_KEY; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteStickySessionEncoderProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteStickySessionEncoderProviderFactory.java index 4e6164daf2d..4be3872e913 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteStickySessionEncoderProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteStickySessionEncoderProviderFactory.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.connections.infinispan.InfinispanUtil; @@ -36,6 +35,8 @@ import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.sessions.StickySessionEncoderProvider; import org.keycloak.sessions.StickySessionEncoderProviderFactory; +import org.jboss.logging.Logger; + public class RemoteStickySessionEncoderProviderFactory implements StickySessionEncoderProviderFactory, EnvironmentDependentProviderFactory, StickySessionEncoderProvider { private static final Logger log = Logger.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserLoginFailureProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserLoginFailureProvider.java index ade1c723e5c..926fc792dc0 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserLoginFailureProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserLoginFailureProvider.java @@ -19,7 +19,6 @@ package org.keycloak.models.sessions.infinispan.remote; import java.lang.invoke.MethodHandles; import java.util.Objects; -import org.jboss.logging.Logger; import org.keycloak.models.RealmModel; import org.keycloak.models.UserLoginFailureModel; import org.keycloak.models.UserLoginFailureProvider; @@ -27,6 +26,8 @@ import org.keycloak.models.sessions.infinispan.entities.LoginFailureEntity; import org.keycloak.models.sessions.infinispan.entities.LoginFailureKey; import org.keycloak.models.sessions.infinispan.remote.transaction.LoginFailureChangeLogTransaction; +import org.jboss.logging.Logger; + import static org.keycloak.common.util.StackUtil.getShortStackTrace; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserLoginFailureProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserLoginFailureProviderFactory.java index 0dd4f6fe63e..a3cffa939ad 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserLoginFailureProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserLoginFailureProviderFactory.java @@ -22,9 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.util.concurrent.BlockingManager; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.infinispan.util.InfinispanUtils; @@ -48,6 +45,10 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ServerInfoAwareProviderFactory; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.util.concurrent.BlockingManager; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.LOGIN_FAILURE_CACHE_NAME; public class RemoteUserLoginFailureProviderFactory implements UserLoginFailureProviderFactory, UpdaterFactory, EnvironmentDependentProviderFactory, RemoteChangeLogTransaction.SharedState, ServerInfoAwareProviderFactory { diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserSessionProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserSessionProvider.java index 7837c67f83d..ec17b28fd38 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserSessionProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserSessionProvider.java @@ -31,10 +31,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import io.reactivex.rxjava3.core.Flowable; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.commons.util.concurrent.CompletionStages; -import org.jboss.logging.Logger; import org.keycloak.cluster.ClusterProvider; import org.keycloak.common.Profile; import org.keycloak.common.util.SecretGenerator; @@ -64,6 +60,11 @@ import org.keycloak.models.sessions.infinispan.remote.transaction.UserSessionTra import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.utils.StreamsUtil; +import io.reactivex.rxjava3.core.Flowable; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.commons.util.concurrent.CompletionStages; +import org.jboss.logging.Logger; + import static org.keycloak.models.Constants.SESSION_NOTE_LIGHTWEIGHT_USER; /** diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserSessionProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserSessionProviderFactory.java index 1c477bb3583..bece2621b27 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserSessionProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/RemoteUserSessionProviderFactory.java @@ -5,8 +5,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.util.concurrent.BlockingManager; import org.keycloak.Config; import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; @@ -36,6 +34,9 @@ import org.keycloak.provider.ProviderEvent; import org.keycloak.provider.ProviderEventListener; import org.keycloak.provider.ServerInfoAwareProviderFactory; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.util.concurrent.BlockingManager; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_USER_SESSION_CACHE_NAME; diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/RemoteChangeLogTransaction.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/RemoteChangeLogTransaction.java index deb0bbcd760..6f40fd15c5f 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/RemoteChangeLogTransaction.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/RemoteChangeLogTransaction.java @@ -24,12 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import org.infinispan.client.hotrod.Flag; -import org.infinispan.client.hotrod.MetadataValue; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.commons.util.concurrent.AggregateCompletionStage; -import org.infinispan.commons.util.concurrent.CompletableFutures; -import org.infinispan.util.concurrent.BlockingManager; import org.keycloak.common.util.Retry; import org.keycloak.models.KeycloakTransaction; import org.keycloak.models.sessions.infinispan.changes.remote.remover.ConditionalRemover; @@ -39,6 +33,13 @@ import org.keycloak.models.sessions.infinispan.changes.remote.updater.UpdaterFac import org.keycloak.models.sessions.infinispan.transaction.DatabaseUpdate; import org.keycloak.models.sessions.infinispan.transaction.NonBlockingTransaction; +import org.infinispan.client.hotrod.Flag; +import org.infinispan.client.hotrod.MetadataValue; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.commons.util.concurrent.AggregateCompletionStage; +import org.infinispan.commons.util.concurrent.CompletableFutures; +import org.infinispan.util.concurrent.BlockingManager; + /** * A {@link KeycloakTransaction} implementation that keeps track of changes made to entities stored in a Infinispan * cache. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/RemoteInfinispanKeycloakTransaction.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/RemoteInfinispanKeycloakTransaction.java index 362e7d15615..c5e0107241c 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/RemoteInfinispanKeycloakTransaction.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/RemoteInfinispanKeycloakTransaction.java @@ -26,13 +26,14 @@ import java.util.concurrent.CompletionStage; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; +import org.keycloak.models.sessions.infinispan.changes.remote.remover.ConditionalRemover; +import org.keycloak.models.sessions.infinispan.transaction.DatabaseUpdate; +import org.keycloak.models.sessions.infinispan.transaction.NonBlockingTransaction; + import org.infinispan.client.hotrod.RemoteCache; import org.infinispan.commons.util.concurrent.AggregateCompletionStage; import org.infinispan.commons.util.concurrent.CompletableFutures; import org.jboss.logging.Logger; -import org.keycloak.models.sessions.infinispan.changes.remote.remover.ConditionalRemover; -import org.keycloak.models.sessions.infinispan.transaction.DatabaseUpdate; -import org.keycloak.models.sessions.infinispan.transaction.NonBlockingTransaction; class RemoteInfinispanKeycloakTransaction> implements NonBlockingTransaction { diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/SingleUseObjectTransaction.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/SingleUseObjectTransaction.java index e3ec9541adf..b833e8dcba4 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/SingleUseObjectTransaction.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/remote/transaction/SingleUseObjectTransaction.java @@ -17,11 +17,12 @@ package org.keycloak.models.sessions.infinispan.remote.transaction; -import org.infinispan.client.hotrod.RemoteCache; import org.keycloak.models.sessions.infinispan.changes.remote.remover.ConditionalRemover; import org.keycloak.models.sessions.infinispan.changes.remote.remover.EmptyConditionalRemover; import org.keycloak.models.sessions.infinispan.entities.SingleUseObjectValueEntity; +import org.infinispan.client.hotrod.RemoteCache; + /** * Syntactic sugar for * {@code RemoteInfinispanKeycloakTransaction diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/AuthClientSessionSetMapper.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/AuthClientSessionSetMapper.java index 93c1930fc26..543fa35dd9d 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/AuthClientSessionSetMapper.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/AuthClientSessionSetMapper.java @@ -21,13 +21,14 @@ import java.util.Map; import java.util.Set; import java.util.function.Function; -import org.infinispan.CacheStream; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; +import org.infinispan.CacheStream; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * A {@link Function} to be used by {@link CacheStream} to extract the client's ID from the client sessions associated * to a {@link UserSessionEntity}. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/ClientSessionFilterByUser.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/ClientSessionFilterByUser.java index 344afb3604e..ca24033ecbc 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/ClientSessionFilterByUser.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/ClientSessionFilterByUser.java @@ -21,11 +21,12 @@ import java.util.Map; import java.util.Objects; import java.util.function.Predicate; -import org.infinispan.protostream.annotations.Proto; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; import org.keycloak.models.sessions.infinispan.entities.AuthenticatedClientSessionEntity; +import org.infinispan.protostream.annotations.Proto; +import org.infinispan.protostream.annotations.ProtoTypeId; + import static org.keycloak.marshalling.Marshalling.CLIENT_SESSION_USER_FILTER; /** diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/CollectionToStreamMapper.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/CollectionToStreamMapper.java index 263c6ac4d5b..c4405034fd4 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/CollectionToStreamMapper.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/CollectionToStreamMapper.java @@ -22,9 +22,10 @@ import java.util.Collection; import java.util.function.Function; import java.util.stream.Stream; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; /** * A {@link Function} that converts the {@link Collection} to a {@link Stream}. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/GroupAndCountCollectorSupplier.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/GroupAndCountCollectorSupplier.java index 2131a1e0c71..70edb64cdb9 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/GroupAndCountCollectorSupplier.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/GroupAndCountCollectorSupplier.java @@ -23,10 +23,11 @@ import java.util.function.Supplier; import java.util.stream.Collector; import java.util.stream.Collectors; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.commons.util.concurrent.CompletableFutures; import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; /** * A {@link Supplier} that returns a {@link Collector} to group and count elements. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/MapEntryToKeyMapper.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/MapEntryToKeyMapper.java index 668a3c1d0ed..7268b388416 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/MapEntryToKeyMapper.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/MapEntryToKeyMapper.java @@ -21,9 +21,10 @@ import java.lang.invoke.SerializedLambda; import java.util.Map; import java.util.function.Function; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.marshalling.Marshalling; /** * A {@link Function} to extract the key from a {@link Map.Entry}. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java index 66723690d29..930354d2a48 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/Mappers.java @@ -17,17 +17,17 @@ package org.keycloak.models.sessions.infinispan.stream; -import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; -import org.keycloak.models.sessions.infinispan.entities.LoginFailureEntity; -import org.keycloak.models.sessions.infinispan.entities.LoginFailureKey; -import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; - import java.util.Collection; import java.util.Map; import java.util.Set; import java.util.function.Function; import java.util.stream.Stream; +import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; +import org.keycloak.models.sessions.infinispan.entities.LoginFailureEntity; +import org.keycloak.models.sessions.infinispan.entities.LoginFailureKey; +import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; + /** * @author Stian Thorgersen */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionPredicate.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionPredicate.java index 455b72dd573..4303af01839 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionPredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionPredicate.java @@ -17,11 +17,12 @@ package org.keycloak.models.sessions.infinispan.stream; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.sessions.infinispan.entities.SessionEntity; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Marek Posolda */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionUnwrapMapper.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionUnwrapMapper.java index 72cce7ed75a..8f82b8c9f39 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionUnwrapMapper.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionUnwrapMapper.java @@ -20,12 +20,13 @@ package org.keycloak.models.sessions.infinispan.stream; import java.util.Map; import java.util.function.Function; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; import org.keycloak.models.sessions.infinispan.entities.SessionEntity; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * A {@link Function} to unwrap the {@link SessionEntity} from the {@link SessionEntityWrapper}. *

diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionWrapperPredicate.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionWrapperPredicate.java index 94aa4f659b5..5e14bf3e0ad 100755 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionWrapperPredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/SessionWrapperPredicate.java @@ -17,12 +17,13 @@ package org.keycloak.models.sessions.infinispan.stream; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.marshalling.Marshalling; import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; import org.keycloak.models.sessions.infinispan.entities.SessionEntity; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Stian Thorgersen */ diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/UserSessionPredicate.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/UserSessionPredicate.java index feea6e858bb..d881ad6fd53 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/UserSessionPredicate.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/stream/UserSessionPredicate.java @@ -17,17 +17,18 @@ package org.keycloak.models.sessions.infinispan.stream; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.models.UserSessionModel; +import java.util.Map; +import java.util.function.Predicate; + import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.UserSessionModel; import org.keycloak.models.sessions.infinispan.AuthenticatedClientSessionAdapter; import org.keycloak.models.sessions.infinispan.changes.SessionEntityWrapper; import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; -import java.util.Map; -import java.util.function.Predicate; +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; /** * @author Stian Thorgersen diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/transaction/DefaultInfinispanTransactionProvider.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/transaction/DefaultInfinispanTransactionProvider.java index 17c7efb8605..ad961db4fad 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/transaction/DefaultInfinispanTransactionProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/transaction/DefaultInfinispanTransactionProvider.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Objects; import java.util.function.Consumer; -import org.infinispan.commons.util.concurrent.AggregateCompletionStage; -import org.infinispan.commons.util.concurrent.CompletionStages; import org.keycloak.common.util.Retry; import org.keycloak.models.AbstractKeycloakTransaction; import org.keycloak.models.KeycloakSession; @@ -32,6 +30,9 @@ import org.keycloak.models.KeycloakTransaction; import org.keycloak.models.sessions.infinispan.changes.PersistentSessionsWorker; import org.keycloak.models.utils.KeycloakModelUtils; +import org.infinispan.commons.util.concurrent.AggregateCompletionStage; +import org.infinispan.commons.util.concurrent.CompletionStages; + /** * A {@link KeycloakTransaction} that collects {@link NonBlockingTransaction} to commit/rollback in a non-blocking * fashion. diff --git a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/util/InfinispanKeyGenerator.java b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/util/InfinispanKeyGenerator.java index d892075bceb..9d82fe6ef7d 100644 --- a/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/util/InfinispanKeyGenerator.java +++ b/model/infinispan/src/main/java/org/keycloak/models/sessions/infinispan/util/InfinispanKeyGenerator.java @@ -22,15 +22,16 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; +import org.keycloak.common.util.SecretGenerator; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.sessions.infinispan.changes.CacheHolder; +import org.keycloak.sessions.StickySessionEncoderProvider; + import org.infinispan.Cache; import org.infinispan.affinity.KeyAffinityService; import org.infinispan.affinity.KeyAffinityServiceFactory; import org.infinispan.affinity.KeyGenerator; import org.jboss.logging.Logger; -import org.keycloak.common.util.SecretGenerator; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.sessions.infinispan.changes.CacheHolder; -import org.keycloak.sessions.StickySessionEncoderProvider; /** * @author Marek Posolda diff --git a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheEmbeddedConfigProvider.java b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheEmbeddedConfigProvider.java index 0198fb0f0f5..5f9abf86d63 100644 --- a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheEmbeddedConfigProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheEmbeddedConfigProvider.java @@ -17,9 +17,10 @@ package org.keycloak.spi.infinispan; +import org.keycloak.provider.Provider; + import org.infinispan.configuration.parsing.ConfigurationBuilderHolder; import org.infinispan.manager.EmbeddedCacheManager; -import org.keycloak.provider.Provider; /** * A provider to create the {@link ConfigurationBuilderHolder} to configure the {@link EmbeddedCacheManager}. diff --git a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheEmbeddedConfigProviderSpi.java b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheEmbeddedConfigProviderSpi.java index 597ad03e8eb..c7155a65b64 100644 --- a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheEmbeddedConfigProviderSpi.java +++ b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheEmbeddedConfigProviderSpi.java @@ -17,9 +17,10 @@ package org.keycloak.spi.infinispan; +import org.keycloak.provider.Spi; + import org.infinispan.configuration.parsing.ConfigurationBuilderHolder; import org.infinispan.manager.EmbeddedCacheManager; -import org.keycloak.provider.Spi; /** * The {@link Spi} implementation for the {@link CacheEmbeddedConfigProviderFactory} and diff --git a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheRemoteConfigProvider.java b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheRemoteConfigProvider.java index ddf4d0c1b13..e459e84d1b5 100644 --- a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheRemoteConfigProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/CacheRemoteConfigProvider.java @@ -19,9 +19,10 @@ package org.keycloak.spi.infinispan; import java.util.Optional; -import org.infinispan.client.hotrod.configuration.Configuration; import org.keycloak.provider.Provider; +import org.infinispan.client.hotrod.configuration.Configuration; + /** * A provider to create a configuration to the Hot Rod client. */ diff --git a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/JGroupsCertificateProvider.java b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/JGroupsCertificateProvider.java index b1f017a5909..c147d4c8a5f 100644 --- a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/JGroupsCertificateProvider.java +++ b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/JGroupsCertificateProvider.java @@ -18,12 +18,11 @@ package org.keycloak.spi.infinispan; import java.time.Duration; - -import org.keycloak.provider.Provider; - import javax.net.ssl.KeyManager; import javax.net.ssl.TrustManager; +import org.keycloak.provider.Provider; + /** * A {@link Provider} for the TLS certificate for JGroups communication. *

diff --git a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/CacheConfigurator.java b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/CacheConfigurator.java index 38603ec2950..bb8a68c9547 100644 --- a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/CacheConfigurator.java +++ b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/CacheConfigurator.java @@ -22,6 +22,14 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; +import org.keycloak.Config; +import org.keycloak.config.CachingOptions; +import org.keycloak.marshalling.Marshalling; +import org.keycloak.models.sessions.infinispan.entities.LoginFailureEntity; +import org.keycloak.models.sessions.infinispan.entities.RemoteAuthenticatedClientSessionEntity; +import org.keycloak.models.sessions.infinispan.entities.RemoteUserSessionEntity; +import org.keycloak.models.sessions.infinispan.entities.RootAuthenticationSessionEntity; + import org.infinispan.commons.dataconversion.MediaType; import org.infinispan.configuration.cache.AbstractStoreConfiguration; import org.infinispan.configuration.cache.BackupConfiguration; @@ -36,13 +44,6 @@ import org.infinispan.transaction.LockingMode; import org.infinispan.transaction.TransactionMode; import org.infinispan.transaction.lookup.EmbeddedTransactionManagerLookup; import org.jboss.logging.Logger; -import org.keycloak.Config; -import org.keycloak.config.CachingOptions; -import org.keycloak.marshalling.Marshalling; -import org.keycloak.models.sessions.infinispan.entities.LoginFailureEntity; -import org.keycloak.models.sessions.infinispan.entities.RemoteAuthenticatedClientSessionEntity; -import org.keycloak.models.sessions.infinispan.entities.RemoteUserSessionEntity; -import org.keycloak.models.sessions.infinispan.entities.RootAuthenticationSessionEntity; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.ACTION_TOKEN_CACHE; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.ALL_CACHES_NAME; diff --git a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/ClientSessionKeyGrouper.java b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/ClientSessionKeyGrouper.java index f36e613bd26..b7ef57c6ef3 100644 --- a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/ClientSessionKeyGrouper.java +++ b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/ClientSessionKeyGrouper.java @@ -17,9 +17,10 @@ package org.keycloak.spi.infinispan.impl.embedded; -import org.infinispan.distribution.group.Grouper; import org.keycloak.models.sessions.infinispan.entities.EmbeddedClientSessionKey; +import org.infinispan.distribution.group.Grouper; + /** * A {@link Grouper} implementation that uses the User Session ID to assign the Client Session to the cache segment. It * groups all the Client Sessions belonging to the same User Session in the same node where the User Session lives. diff --git a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/DefaultCacheEmbeddedConfigProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/DefaultCacheEmbeddedConfigProviderFactory.java index fd49c2e06f5..cc4f8991e7a 100644 --- a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/DefaultCacheEmbeddedConfigProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/DefaultCacheEmbeddedConfigProviderFactory.java @@ -17,13 +17,6 @@ package org.keycloak.spi.infinispan.impl.embedded; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.ALL_CACHES_NAME; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLUSTERED_CACHE_NUM_OWNERS; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLUSTERED_MAX_COUNT_CACHES; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.LOCAL_CACHE_NAMES; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.LOCAL_MAX_COUNT_CACHES; -import static org.keycloak.spi.infinispan.impl.embedded.JGroupsConfigurator.createJGroupsProperties; - import java.io.IOException; import java.lang.invoke.MethodHandles; import java.nio.file.Paths; @@ -32,13 +25,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Stream; -import org.infinispan.configuration.cache.ConfigurationBuilder; -import org.infinispan.configuration.cache.StatisticsConfigurationBuilder; -import org.infinispan.configuration.global.ShutdownHookBehavior; -import org.infinispan.configuration.parsing.ConfigurationBuilderHolder; -import org.infinispan.configuration.parsing.ParserRegistry; -import org.infinispan.metrics.config.MicrometerMeterRegisterConfigurationBuilder; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.config.CachingOptions; @@ -58,6 +44,20 @@ import org.keycloak.spi.infinispan.JGroupsCertificateProvider; import org.keycloak.spi.infinispan.impl.Util; import io.micrometer.core.instrument.Metrics; +import org.infinispan.configuration.cache.ConfigurationBuilder; +import org.infinispan.configuration.cache.StatisticsConfigurationBuilder; +import org.infinispan.configuration.global.ShutdownHookBehavior; +import org.infinispan.configuration.parsing.ConfigurationBuilderHolder; +import org.infinispan.configuration.parsing.ParserRegistry; +import org.infinispan.metrics.config.MicrometerMeterRegisterConfigurationBuilder; +import org.jboss.logging.Logger; + +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.ALL_CACHES_NAME; +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLUSTERED_CACHE_NUM_OWNERS; +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLUSTERED_MAX_COUNT_CACHES; +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.LOCAL_CACHE_NAMES; +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.LOCAL_MAX_COUNT_CACHES; +import static org.keycloak.spi.infinispan.impl.embedded.JGroupsConfigurator.createJGroupsProperties; /** * The default implementation of {@link CacheEmbeddedConfigProviderFactory}. diff --git a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/JGroupsConfigurator.java b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/JGroupsConfigurator.java index 7d6b908c68f..7ff0ac2c48b 100644 --- a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/JGroupsConfigurator.java +++ b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/embedded/JGroupsConfigurator.java @@ -17,18 +17,6 @@ package org.keycloak.spi.infinispan.impl.embedded; -import static org.infinispan.configuration.global.TransportConfiguration.CLUSTER_NAME; -import static org.infinispan.configuration.global.TransportConfiguration.STACK; -import static org.keycloak.config.CachingOptions.CACHE_EMBEDDED_PREFIX; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.JBOSS_NODE_NAME; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.JBOSS_SITE_NAME; -import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.MACHINE_NAME; -import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.NODE_NAME; -import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.PROVIDER_ID; -import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.RACK_NAME; -import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.SITE_NAME; -import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.TRACING; - import java.lang.invoke.MethodHandles; import java.security.KeyManagementException; import java.security.NoSuchAlgorithmException; @@ -40,13 +28,32 @@ import java.util.List; import java.util.Map; import java.util.Objects; import java.util.function.Consumer; - import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLParameters; import javax.net.ssl.SSLServerSocket; import javax.net.ssl.TrustManager; +import org.keycloak.Config; +import org.keycloak.common.util.Retry; +import org.keycloak.config.CachingOptions; +import org.keycloak.config.Option; +import org.keycloak.connections.infinispan.InfinispanConnectionSpi; +import org.keycloak.connections.jpa.JpaConnectionProvider; +import org.keycloak.connections.jpa.JpaConnectionProviderFactory; +import org.keycloak.connections.jpa.util.JpaUtils; +import org.keycloak.infinispan.util.InfinispanUtils; +import org.keycloak.jgroups.header.TracerHeader; +import org.keycloak.jgroups.protocol.KEYCLOAK_JDBC_PING2; +import org.keycloak.jgroups.protocol.OPEN_TELEMETRY; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.provider.ProviderConfigurationBuilder; +import org.keycloak.spi.infinispan.JGroupsCertificateProvider; +import org.keycloak.spi.infinispan.impl.Util; +import org.keycloak.storage.configuration.ServerConfigStorageProvider; + import org.infinispan.commons.configuration.attributes.Attribute; import org.infinispan.configuration.global.TransportConfigurationBuilder; import org.infinispan.configuration.parsing.ConfigurationBuilderHolder; @@ -66,25 +73,19 @@ import org.jgroups.util.DefaultSocketFactory; import org.jgroups.util.ExtendedUUID; import org.jgroups.util.SocketFactory; import org.jgroups.util.UUID; -import org.keycloak.Config; -import org.keycloak.common.util.Retry; -import org.keycloak.config.CachingOptions; -import org.keycloak.config.Option; -import org.keycloak.connections.infinispan.InfinispanConnectionSpi; -import org.keycloak.connections.jpa.JpaConnectionProvider; -import org.keycloak.connections.jpa.JpaConnectionProviderFactory; -import org.keycloak.connections.jpa.util.JpaUtils; -import org.keycloak.infinispan.util.InfinispanUtils; -import org.keycloak.jgroups.protocol.KEYCLOAK_JDBC_PING2; -import org.keycloak.jgroups.protocol.OPEN_TELEMETRY; -import org.keycloak.jgroups.header.TracerHeader; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.provider.ProviderConfigurationBuilder; -import org.keycloak.spi.infinispan.JGroupsCertificateProvider; -import org.keycloak.spi.infinispan.impl.Util; -import org.keycloak.storage.configuration.ServerConfigStorageProvider; + +import static org.keycloak.config.CachingOptions.CACHE_EMBEDDED_PREFIX; +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.JBOSS_NODE_NAME; +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.JBOSS_SITE_NAME; +import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.MACHINE_NAME; +import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.NODE_NAME; +import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.PROVIDER_ID; +import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.RACK_NAME; +import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.SITE_NAME; +import static org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory.TRACING; + +import static org.infinispan.configuration.global.TransportConfiguration.CLUSTER_NAME; +import static org.infinispan.configuration.global.TransportConfiguration.STACK; /** * Utility class to configure JGroups based on the Keycloak configuration. diff --git a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/remote/DefaultCacheRemoteConfigProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/remote/DefaultCacheRemoteConfigProviderFactory.java index b64895cbbf9..fc61bc8094a 100644 --- a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/remote/DefaultCacheRemoteConfigProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/remote/DefaultCacheRemoteConfigProviderFactory.java @@ -27,14 +27,8 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; import java.util.Properties; +import javax.net.ssl.SSLContext; -import org.infinispan.client.hotrod.configuration.AuthenticationConfigurationBuilder; -import org.infinispan.client.hotrod.configuration.ClientIntelligence; -import org.infinispan.client.hotrod.configuration.Configuration; -import org.infinispan.client.hotrod.configuration.ConfigurationBuilder; -import org.infinispan.client.hotrod.configuration.ExhaustedAction; -import org.infinispan.client.hotrod.impl.ConfigurationProperties; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.config.CachingOptions; import org.keycloak.infinispan.util.InfinispanUtils; @@ -49,11 +43,18 @@ import org.keycloak.spi.infinispan.CacheRemoteConfigProvider; import org.keycloak.spi.infinispan.CacheRemoteConfigProviderFactory; import org.keycloak.spi.infinispan.impl.embedded.CacheConfigurator; -import javax.net.ssl.SSLContext; +import org.infinispan.client.hotrod.configuration.AuthenticationConfigurationBuilder; +import org.infinispan.client.hotrod.configuration.ClientIntelligence; +import org.infinispan.client.hotrod.configuration.Configuration; +import org.infinispan.client.hotrod.configuration.ConfigurationBuilder; +import org.infinispan.client.hotrod.configuration.ExhaustedAction; +import org.infinispan.client.hotrod.impl.ConfigurationProperties; +import org.jboss.logging.Logger; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLUSTERED_CACHE_NAMES; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.skipSessionsCacheIfRequired; import static org.keycloak.spi.infinispan.impl.Util.copyFromOption; + import static org.wildfly.security.sasl.util.SaslMechanismInformation.Names.SCRAM_SHA_512; /** diff --git a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/remote/DisabledCacheRemoteConfigProviderFactory.java b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/remote/DisabledCacheRemoteConfigProviderFactory.java index a721c9d2725..cef456ab6bf 100644 --- a/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/remote/DisabledCacheRemoteConfigProviderFactory.java +++ b/model/infinispan/src/main/java/org/keycloak/spi/infinispan/impl/remote/DisabledCacheRemoteConfigProviderFactory.java @@ -19,7 +19,6 @@ package org.keycloak.spi.infinispan.impl.remote; import java.util.Optional; -import org.infinispan.client.hotrod.configuration.Configuration; import org.keycloak.Config; import org.keycloak.infinispan.util.InfinispanUtils; import org.keycloak.models.KeycloakSession; @@ -28,6 +27,8 @@ import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.spi.infinispan.CacheRemoteConfigProvider; import org.keycloak.spi.infinispan.CacheRemoteConfigProviderFactory; +import org.infinispan.client.hotrod.configuration.Configuration; + /** * Implementation used when an external Infinispan cluster is not configured. */ diff --git a/model/infinispan/src/test/java/org/keycloak/jgroups/protocol/JdbcPing2Test.java b/model/infinispan/src/test/java/org/keycloak/jgroups/protocol/JdbcPing2Test.java index c42eafc7874..a9c84987a78 100644 --- a/model/infinispan/src/test/java/org/keycloak/jgroups/protocol/JdbcPing2Test.java +++ b/model/infinispan/src/test/java/org/keycloak/jgroups/protocol/JdbcPing2Test.java @@ -1,5 +1,16 @@ package org.keycloak.jgroups.protocol; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import org.keycloak.infinispan.health.impl.JdbcPingClusterHealthImpl; + import org.infinispan.util.concurrent.WithinThreadExecutor; import org.jboss.logging.Logger; import org.jgroups.Address; @@ -10,16 +21,6 @@ import org.jgroups.util.UUID; import org.jgroups.util.Util; import org.junit.Ignore; import org.junit.Test; -import org.keycloak.infinispan.health.impl.JdbcPingClusterHealthImpl; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import java.util.stream.Stream; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/model/infinispan/src/test/java/org/keycloak/keys/infinispan/InfinispanKeyStorageProviderTest.java b/model/infinispan/src/test/java/org/keycloak/keys/infinispan/InfinispanKeyStorageProviderTest.java index 477121863f4..5ac5fb09ff0 100644 --- a/model/infinispan/src/test/java/org/keycloak/keys/infinispan/InfinispanKeyStorageProviderTest.java +++ b/model/infinispan/src/test/java/org/keycloak/keys/infinispan/InfinispanKeyStorageProviderTest.java @@ -17,6 +17,18 @@ package org.keycloak.keys.infinispan; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.FutureTask; +import java.util.concurrent.atomic.AtomicInteger; + +import org.keycloak.common.util.Time; +import org.keycloak.connections.infinispan.InfinispanConnectionProvider; +import org.keycloak.crypto.PublicKeysWrapper; +import org.keycloak.keys.PublicKeyLoader; + import org.infinispan.Cache; import org.infinispan.configuration.cache.Configuration; import org.infinispan.configuration.cache.ConfigurationBuilder; @@ -27,17 +39,6 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.keycloak.common.util.Time; -import org.keycloak.connections.infinispan.InfinispanConnectionProvider; -import org.keycloak.crypto.PublicKeysWrapper; -import org.keycloak.keys.PublicKeyLoader; - -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.FutureTask; -import java.util.concurrent.atomic.AtomicInteger; /** * @author Marek Posolda diff --git a/model/infinispan/src/test/java/org/keycloak/models/sessions/infinispan/initializer/ConcurrencyVersioningTest.java b/model/infinispan/src/test/java/org/keycloak/models/sessions/infinispan/initializer/ConcurrencyVersioningTest.java index c327f869f03..61b858ce4fd 100644 --- a/model/infinispan/src/test/java/org/keycloak/models/sessions/infinispan/initializer/ConcurrencyVersioningTest.java +++ b/model/infinispan/src/test/java/org/keycloak/models/sessions/infinispan/initializer/ConcurrencyVersioningTest.java @@ -17,6 +17,16 @@ package org.keycloak.models.sessions.infinispan.initializer; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +import jakarta.transaction.NotSupportedException; +import jakarta.transaction.Status; +import jakarta.transaction.SystemException; + +import org.keycloak.connections.infinispan.InfinispanConnectionProvider; + import org.infinispan.Cache; import org.infinispan.configuration.cache.Configuration; import org.infinispan.configuration.cache.ConfigurationBuilder; @@ -29,14 +39,6 @@ import org.infinispan.util.concurrent.IsolationLevel; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; -import org.keycloak.connections.infinispan.InfinispanConnectionProvider; - -import jakarta.transaction.NotSupportedException; -import jakarta.transaction.Status; -import jakarta.transaction.SystemException; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; /** * Unit tests to make sure our model caching concurrency model will work. diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java index 9f338f82a6b..4dbd570dbe6 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/PolicyEntity.java @@ -41,13 +41,14 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; +import org.keycloak.representations.idm.authorization.DecisionStrategy; +import org.keycloak.representations.idm.authorization.Logic; + import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; import org.hibernate.annotations.Nationalized; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; -import org.keycloak.representations.idm.authorization.DecisionStrategy; -import org.keycloak.representations.idm.authorization.Logic; /** * @author Pedro Igor diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java index 3d5516e782a..fa608c04b9a 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java @@ -18,6 +18,12 @@ package org.keycloak.authorization.jpa.entities; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CascadeType; @@ -35,12 +41,6 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - import org.hibernate.annotations.BatchSize; import org.hibernate.annotations.Fetch; import org.hibernate.annotations.FetchMode; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceServerEntity.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceServerEntity.java index ed92c62ad2b..7e3e6a71ed0 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceServerEntity.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceServerEntity.java @@ -18,14 +18,14 @@ package org.keycloak.authorization.jpa.entities; -import org.keycloak.representations.idm.authorization.DecisionStrategy; -import org.keycloak.representations.idm.authorization.PolicyEnforcementMode; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; +import org.keycloak.representations.idm.authorization.DecisionStrategy; +import org.keycloak.representations.idm.authorization.PolicyEnforcementMode; + /** * @author Pedro Igor */ diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPermissionTicketStore.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPermissionTicketStore.java index f124174c662..e54b58815bf 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPermissionTicketStore.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPermissionTicketStore.java @@ -26,6 +26,7 @@ import java.util.Objects; import jakarta.persistence.EntityManager; import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; import jakarta.persistence.TypedQuery; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; @@ -42,7 +43,6 @@ import org.keycloak.authorization.store.PermissionTicketStore; import org.keycloak.authorization.store.ResourceStore; import org.keycloak.common.util.Time; import org.keycloak.models.utils.KeycloakModelUtils; -import jakarta.persistence.LockModeType; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPolicyStore.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPolicyStore.java index 35c65a51c4b..61fb2a665de 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPolicyStore.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAPolicyStore.java @@ -28,6 +28,7 @@ import java.util.stream.Stream; import jakarta.persistence.EntityManager; import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; import jakarta.persistence.NoResultException; import jakarta.persistence.TypedQuery; import jakarta.persistence.criteria.CriteriaBuilder; @@ -37,9 +38,8 @@ import jakarta.persistence.criteria.MapJoin; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import org.hibernate.Session; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.jpa.entities.PolicyEntity; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; @@ -49,7 +49,8 @@ import org.keycloak.authorization.store.PolicyStore; import org.keycloak.authorization.store.StoreFactory; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.authorization.AbstractPolicyRepresentation; -import jakarta.persistence.LockModeType; + +import org.hibernate.Session; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceServerStore.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceServerStore.java index 6185abafdc1..6d355b47f63 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceServerStore.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceServerStore.java @@ -16,6 +16,11 @@ */ package org.keycloak.authorization.jpa.store; +import java.util.List; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.jpa.entities.PermissionTicketEntity; import org.keycloak.authorization.jpa.entities.PolicyEntity; @@ -24,14 +29,10 @@ import org.keycloak.authorization.jpa.entities.ResourceServerEntity; import org.keycloak.authorization.jpa.entities.ScopeEntity; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.store.ResourceServerStore; +import org.keycloak.models.ClientModel; import org.keycloak.models.ModelException; import org.keycloak.storage.StorageId; -import jakarta.persistence.EntityManager; -import jakarta.persistence.TypedQuery; -import java.util.List; -import org.keycloak.models.ClientModel; - /** * @author Pedro Igor */ diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceStore.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceStore.java index 375b929c188..66044dcee0f 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceStore.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAResourceStore.java @@ -16,14 +16,13 @@ */ package org.keycloak.authorization.jpa.store; -import org.keycloak.authorization.AuthorizationProvider; -import org.keycloak.authorization.jpa.entities.ResourceEntity; -import org.keycloak.authorization.model.Resource; -import org.keycloak.authorization.model.ResourceServer; -import org.keycloak.authorization.model.Scope; -import org.keycloak.authorization.store.ResourceStore; -import org.keycloak.authorization.store.StoreFactory; -import org.keycloak.models.utils.KeycloakModelUtils; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Consumer; +import java.util.stream.Collectors; import jakarta.persistence.EntityManager; import jakarta.persistence.FlushModeType; @@ -34,13 +33,15 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Expression; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Consumer; -import java.util.stream.Collectors; + +import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.jpa.entities.ResourceEntity; +import org.keycloak.authorization.model.Resource; +import org.keycloak.authorization.model.ResourceServer; +import org.keycloak.authorization.model.Scope; +import org.keycloak.authorization.store.ResourceStore; +import org.keycloak.authorization.store.StoreFactory; +import org.keycloak.models.utils.KeycloakModelUtils; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAScopeStore.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAScopeStore.java index a67064cac61..d6795705f19 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAScopeStore.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/JPAScopeStore.java @@ -23,6 +23,7 @@ import java.util.Map; import jakarta.persistence.EntityManager; import jakarta.persistence.FlushModeType; +import jakarta.persistence.LockModeType; import jakarta.persistence.NoResultException; import jakarta.persistence.TypedQuery; import jakarta.persistence.criteria.CriteriaBuilder; @@ -36,7 +37,6 @@ import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.model.Scope; import org.keycloak.authorization.store.ScopeStore; import org.keycloak.models.utils.KeycloakModelUtils; -import jakarta.persistence.LockModeType; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PermissionTicketAdapter.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PermissionTicketAdapter.java index 9902d026bb8..f1ab4a0d3da 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PermissionTicketAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PermissionTicketAdapter.java @@ -16,8 +16,6 @@ */ package org.keycloak.authorization.jpa.store; -import static org.keycloak.authorization.UserManagedPermissionUtil.updatePolicy; - import jakarta.persistence.EntityManager; import org.keycloak.authorization.jpa.entities.PermissionTicketEntity; @@ -31,6 +29,8 @@ import org.keycloak.authorization.model.Scope; import org.keycloak.authorization.store.StoreFactory; import org.keycloak.models.jpa.JpaModel; +import static org.keycloak.authorization.UserManagedPermissionUtil.updatePolicy; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PolicyAdapter.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PolicyAdapter.java index 27180eef777..7d2185f60af 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PolicyAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/PolicyAdapter.java @@ -16,6 +16,14 @@ */ package org.keycloak.authorization.jpa.store; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import jakarta.persistence.EntityManager; + import org.keycloak.authorization.jpa.entities.PolicyEntity; import org.keycloak.authorization.jpa.entities.ResourceEntity; import org.keycloak.authorization.jpa.entities.ScopeEntity; @@ -29,13 +37,6 @@ import org.keycloak.models.jpa.JpaModel; import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.Logic; -import jakarta.persistence.EntityManager; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceAdapter.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceAdapter.java index 127c94c9687..0819ac143c7 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceAdapter.java @@ -16,6 +16,18 @@ */ package org.keycloak.authorization.jpa.store; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; + import org.keycloak.authorization.jpa.entities.ResourceAttributeEntity; import org.keycloak.authorization.jpa.entities.ResourceEntity; import org.keycloak.authorization.jpa.entities.ScopeEntity; @@ -28,18 +40,6 @@ import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.jpa.JpaModel; import org.keycloak.models.utils.KeycloakModelUtils; -import jakarta.persistence.EntityManager; -import jakarta.persistence.Query; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceServerAdapter.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceServerAdapter.java index c47f79a6e7f..58b98242c1e 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceServerAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ResourceServerAdapter.java @@ -16,6 +16,8 @@ */ package org.keycloak.authorization.jpa.store; +import jakarta.persistence.EntityManager; + import org.keycloak.authorization.jpa.entities.ResourceServerEntity; import org.keycloak.authorization.model.AbstractAuthorizationModel; import org.keycloak.authorization.model.ResourceServer; @@ -24,8 +26,6 @@ import org.keycloak.models.jpa.JpaModel; import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.PolicyEnforcementMode; -import jakarta.persistence.EntityManager; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ScopeAdapter.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ScopeAdapter.java index fb0ab9bdd8f..5510ccfbbc2 100644 --- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ScopeAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/store/ScopeAdapter.java @@ -16,6 +16,8 @@ */ package org.keycloak.authorization.jpa.store; +import jakarta.persistence.EntityManager; + import org.keycloak.authorization.jpa.entities.ScopeEntity; import org.keycloak.authorization.model.AbstractAuthorizationModel; import org.keycloak.authorization.model.ResourceServer; @@ -23,8 +25,6 @@ import org.keycloak.authorization.model.Scope; import org.keycloak.authorization.store.StoreFactory; import org.keycloak.models.jpa.JpaModel; -import jakarta.persistence.EntityManager; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java index e0b4394fcf5..3c74d1ec46f 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProvider.java @@ -17,10 +17,10 @@ package org.keycloak.connections.jpa; -import org.jboss.logging.Logger; - import jakarta.persistence.EntityManager; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java index 88de28f2999..5cf09aa60d1 100755 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/DefaultJpaConnectionProviderFactory.java @@ -17,13 +17,25 @@ package org.keycloak.connections.jpa; -import static org.keycloak.connections.jpa.util.JpaUtils.configureNamedQuery; -import static org.keycloak.connections.jpa.util.JpaUtils.getDatabaseType; -import static org.keycloak.connections.jpa.util.JpaUtils.loadSpecificNamedQueries; +import java.io.File; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import javax.naming.InitialContext; +import javax.sql.DataSource; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.SynchronizationType; +import jakarta.transaction.TransactionManager; +import jakarta.transaction.UserTransaction; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.ServerStartupError; import org.keycloak.common.util.StackUtil; @@ -43,24 +55,14 @@ import org.keycloak.provider.ServerInfoAwareProviderFactory; import org.keycloak.timer.TimerProvider; import org.keycloak.transaction.JtaTransactionManagerLookup; -import javax.naming.InitialContext; -import jakarta.persistence.EntityManager; -import jakarta.persistence.EntityManagerFactory; -import jakarta.persistence.SynchronizationType; -import javax.sql.DataSource; -import jakarta.transaction.TransactionManager; -import jakarta.transaction.UserTransaction; -import java.io.File; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; import liquibase.GlobalConfiguration; +import org.hibernate.cfg.AvailableSettings; +import org.hibernate.engine.transaction.jta.platform.internal.AbstractJtaPlatform; +import org.jboss.logging.Logger; + +import static org.keycloak.connections.jpa.util.JpaUtils.configureNamedQuery; +import static org.keycloak.connections.jpa.util.JpaUtils.getDatabaseType; +import static org.keycloak.connections.jpa.util.JpaUtils.loadSpecificNamedQueries; /** * @author Stian Thorgersen diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java index cc424ae06b9..d02e0d5b3e3 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/HibernateStatsReporter.java @@ -17,6 +17,11 @@ package org.keycloak.connections.jpa; +import jakarta.persistence.EntityManagerFactory; + +import org.keycloak.models.KeycloakSession; +import org.keycloak.timer.ScheduledTask; + import org.hibernate.SessionFactory; import org.hibernate.internal.SessionFactoryImpl; import org.hibernate.stat.CollectionStatistics; @@ -24,10 +29,6 @@ import org.hibernate.stat.EntityStatistics; import org.hibernate.stat.QueryStatistics; import org.hibernate.stat.Statistics; import org.jboss.logging.Logger; -import org.keycloak.models.KeycloakSession; -import org.keycloak.timer.ScheduledTask; - -import jakarta.persistence.EntityManagerFactory; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/JndiEntityManagerLookup.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JndiEntityManagerLookup.java index a689bff50c7..456b44d1b3b 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/JndiEntityManagerLookup.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/JndiEntityManagerLookup.java @@ -18,8 +18,10 @@ package org.keycloak.connections.jpa; import javax.naming.InitialContext; import javax.naming.NamingException; + import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; + import org.keycloak.models.KeycloakSession; /** diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java index ec3797b1f8e..96a723ff198 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProvider.java @@ -17,10 +17,10 @@ package org.keycloak.connections.jpa; -import org.keycloak.provider.Provider; - import jakarta.persistence.EntityManager; +import org.keycloak.provider.Provider; + /** * @author Stian Thorgersen */ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProviderFactory.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProviderFactory.java index 43c375c710e..8d687bcef9d 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaConnectionProviderFactory.java @@ -17,10 +17,10 @@ package org.keycloak.connections.jpa; -import org.keycloak.provider.ProviderFactory; - import java.sql.Connection; +import org.keycloak.provider.ProviderFactory; + /** * @author Stian Thorgersen */ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaExceptionConverter.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaExceptionConverter.java index a13d09fa736..0da3912695a 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaExceptionConverter.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaExceptionConverter.java @@ -16,10 +16,10 @@ */ package org.keycloak.connections.jpa; -import org.keycloak.provider.ExceptionConverter; - import jakarta.persistence.PersistenceException; +import org.keycloak.provider.ExceptionConverter; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java index 3b3ef2ccf20..9b02e59b8de 100755 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/JpaKeycloakTransaction.java @@ -17,12 +17,13 @@ package org.keycloak.connections.jpa; -import org.jboss.logging.Logger; -import org.keycloak.models.KeycloakTransaction; - import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceException; +import org.keycloak.models.KeycloakTransaction; + +import org.jboss.logging.Logger; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/entityprovider/JpaEntityProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/entityprovider/JpaEntityProvider.java index d2d47b1b073..567080e8d91 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/entityprovider/JpaEntityProvider.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/entityprovider/JpaEntityProvider.java @@ -17,10 +17,10 @@ package org.keycloak.connections.jpa.entityprovider; -import org.keycloak.provider.Provider; - import java.util.List; +import org.keycloak.provider.Provider; + /** * @author Erik Mulder * diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProvider.java index ae6745086ee..24a4f734c04 100755 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProvider.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/JpaUpdaterProvider.java @@ -17,11 +17,11 @@ package org.keycloak.connections.jpa.updater; -import org.keycloak.provider.Provider; - import java.io.File; import java.sql.Connection; +import org.keycloak.provider.Provider; + /** * @author Stian Thorgersen */ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java index 60296242bbe..930c0596d1f 100755 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/LiquibaseJpaUpdaterProvider.java @@ -17,6 +17,24 @@ package org.keycloak.connections.jpa.updater.liquibase; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.Writer; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.keycloak.connections.jpa.entityprovider.JpaEntityProvider; +import org.keycloak.connections.jpa.updater.JpaUpdaterProvider; +import org.keycloak.connections.jpa.updater.liquibase.conn.CustomChangeLogHistoryService; +import org.keycloak.connections.jpa.updater.liquibase.conn.KeycloakLiquibase; +import org.keycloak.connections.jpa.updater.liquibase.conn.LiquibaseConnectionProvider; +import org.keycloak.connections.jpa.util.JpaUtils; +import org.keycloak.models.KeycloakSession; + import liquibase.Contexts; import liquibase.LabelExpression; import liquibase.Liquibase; @@ -41,23 +59,6 @@ import liquibase.structure.core.Column; import liquibase.structure.core.Table; import liquibase.util.StreamUtil; import org.jboss.logging.Logger; -import org.keycloak.connections.jpa.entityprovider.JpaEntityProvider; -import org.keycloak.connections.jpa.updater.JpaUpdaterProvider; -import org.keycloak.connections.jpa.updater.liquibase.conn.CustomChangeLogHistoryService; -import org.keycloak.connections.jpa.updater.liquibase.conn.KeycloakLiquibase; -import org.keycloak.connections.jpa.updater.liquibase.conn.LiquibaseConnectionProvider; -import org.keycloak.connections.jpa.util.JpaUtils; -import org.keycloak.models.KeycloakSession; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; /** * @author Stian Thorgersen diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/UpdatedMariaDBDatabase.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/UpdatedMariaDBDatabase.java index 81aeb2d9480..fe179e2f1a9 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/UpdatedMariaDBDatabase.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/UpdatedMariaDBDatabase.java @@ -19,6 +19,7 @@ package org.keycloak.connections.jpa.updater.liquibase; import java.util.HashSet; import java.util.Set; + import liquibase.database.core.MariaDBDatabase; /** diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/UpdatedMySqlDatabase.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/UpdatedMySqlDatabase.java index 82ddce26001..8ce1a425052 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/UpdatedMySqlDatabase.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/UpdatedMySqlDatabase.java @@ -19,6 +19,7 @@ package org.keycloak.connections.jpa.updater.liquibase; import java.util.HashSet; import java.util.Set; + import liquibase.database.core.MySQLDatabase; /** diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java index e48f136c9fd..dc79f6f8f35 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/DefaultLiquibaseConnectionProvider.java @@ -17,6 +17,17 @@ package org.keycloak.connections.jpa.updater.liquibase.conn; +import java.sql.Connection; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.keycloak.Config; +import org.keycloak.config.DatabaseOptions; +import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; + import liquibase.Scope; import liquibase.ThreadLocalScopeManager; import liquibase.database.AbstractJdbcDatabase; @@ -28,16 +39,6 @@ import liquibase.resource.ClassLoaderResourceAccessor; import liquibase.resource.ResourceAccessor; import liquibase.ui.LoggerUIService; import org.jboss.logging.Logger; -import org.keycloak.Config; -import org.keycloak.config.DatabaseOptions; -import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; - -import java.sql.Connection; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/LiquibaseConnectionProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/LiquibaseConnectionProvider.java index adc2bf00e2e..5921b82c68f 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/LiquibaseConnectionProvider.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/conn/LiquibaseConnectionProvider.java @@ -17,10 +17,11 @@ package org.keycloak.connections.jpa.updater.liquibase.conn; -import liquibase.exception.LiquibaseException; +import java.sql.Connection; + import org.keycloak.provider.Provider; -import java.sql.Connection; +import liquibase.exception.LiquibaseException; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AbstractUserFedToComponent.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AbstractUserFedToComponent.java index fc017f6f771..d510ba901c2 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AbstractUserFedToComponent.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AbstractUserFedToComponent.java @@ -16,16 +16,17 @@ */ package org.keycloak.connections.jpa.updater.liquibase.custom; +import java.sql.PreparedStatement; +import java.sql.ResultSet; + +import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.storage.UserStorageProvider; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.DeleteStatement; import liquibase.statement.core.InsertStatement; import liquibase.structure.core.Table; import org.jboss.logging.Logger; -import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.storage.UserStorageProvider; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java index 7f42600c331..aeb47e814d8 100755 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AddRealmCodeSecret.java @@ -17,6 +17,14 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Statement; +import java.util.ArrayList; + +import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider; +import org.keycloak.models.utils.KeycloakModelUtils; + import liquibase.change.custom.CustomSqlChange; import liquibase.database.Database; import liquibase.database.jvm.JdbcConnection; @@ -29,13 +37,6 @@ import liquibase.statement.SqlStatement; import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Schema; import liquibase.structure.core.Table; -import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider; -import org.keycloak.models.utils.KeycloakModelUtils; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Statement; -import java.util.ArrayList; /** * @author Stian Thorgersen diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AuthzResourceUseMoreURIs.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AuthzResourceUseMoreURIs.java index b50f3f67bad..489cfaa29be 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AuthzResourceUseMoreURIs.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/AuthzResourceUseMoreURIs.java @@ -1,12 +1,12 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; +import java.sql.PreparedStatement; +import java.sql.ResultSet; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.InsertStatement; import liquibase.structure.core.Table; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - /** * @author mhajas */ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomCreateIndexChange.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomCreateIndexChange.java index f16e0dc17e5..7b37481d4d9 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomCreateIndexChange.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomCreateIndexChange.java @@ -18,12 +18,11 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; import java.io.StringWriter; -import liquibase.Scope; -import org.jboss.logging.Logger; import org.keycloak.connections.jpa.updater.liquibase.LiquibaseConstants; import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider; import org.keycloak.connections.jpa.updater.liquibase.conn.DefaultLiquibaseConnectionProvider; +import liquibase.Scope; import liquibase.change.AddColumnConfig; import liquibase.change.ChangeFactory; import liquibase.change.ChangeMetaData; @@ -46,6 +45,7 @@ import liquibase.statement.core.CreateIndexStatement; import liquibase.statement.core.RawSqlStatement; import liquibase.structure.core.Schema; import liquibase.structure.core.Table; +import org.jboss.logging.Logger; /** * @author Yoshiyuki Tabata diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomKeycloakTask.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomKeycloakTask.java index b3aba1a7ac7..4ed96b69ac8 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomKeycloakTask.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/CustomKeycloakTask.java @@ -17,6 +17,17 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.Savepoint; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.List; + +import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider; +import org.keycloak.connections.jpa.updater.liquibase.ThreadLocalSessionContext; +import org.keycloak.models.KeycloakSession; + import liquibase.change.custom.CustomSqlChange; import liquibase.database.Database; import liquibase.database.jvm.JdbcConnection; @@ -28,16 +39,6 @@ import liquibase.snapshot.SnapshotGeneratorFactory; import liquibase.statement.SqlStatement; import liquibase.structure.core.Schema; import liquibase.structure.core.Table; -import org.keycloak.connections.jpa.updater.liquibase.LiquibaseJpaUpdaterProvider; -import org.keycloak.connections.jpa.updater.liquibase.ThreadLocalSessionContext; -import org.keycloak.models.KeycloakSession; - -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.Savepoint; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.List; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/ExtractRealmKeysFromRealmTable.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/ExtractRealmKeysFromRealmTable.java index d3def65991e..07594e96370 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/ExtractRealmKeysFromRealmTable.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/ExtractRealmKeysFromRealmTable.java @@ -17,14 +17,15 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; -import liquibase.exception.CustomChangeException; -import liquibase.statement.core.InsertStatement; -import liquibase.structure.core.Table; +import java.sql.PreparedStatement; +import java.sql.ResultSet; + import org.keycloak.keys.KeyProvider; import org.keycloak.models.utils.KeycloakModelUtils; -import java.sql.PreparedStatement; -import java.sql.ResultSet; +import liquibase.exception.CustomChangeException; +import liquibase.statement.core.InsertStatement; +import liquibase.structure.core.Table; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/FederatedUserAttributeTextColumnMigration.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/FederatedUserAttributeTextColumnMigration.java index 6eb27203bab..8ac4e9be19e 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/FederatedUserAttributeTextColumnMigration.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/FederatedUserAttributeTextColumnMigration.java @@ -16,13 +16,14 @@ */ package org.keycloak.connections.jpa.updater.liquibase.custom; +import java.sql.PreparedStatement; +import java.sql.ResultSet; + +import org.keycloak.storage.jpa.JpaHashUtils; + import liquibase.database.core.MySQLDatabase; import liquibase.exception.CustomChangeException; import liquibase.statement.core.RawParameterizedSqlStatement; -import org.keycloak.storage.jpa.JpaHashUtils; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; /** * The MySQL database is the only database where columns longer than 255 characters are changed to a TEXT column, allowing diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate13_0_0_MigrateDefaultRoles.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate13_0_0_MigrateDefaultRoles.java index b3a1ec92c81..968a6adbc51 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate13_0_0_MigrateDefaultRoles.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate13_0_0_MigrateDefaultRoles.java @@ -21,12 +21,14 @@ import java.sql.ResultSet; import java.util.HashMap; import java.util.Map; import java.util.UUID; + +import org.keycloak.models.Constants; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.InsertStatement; import liquibase.statement.core.RawSqlStatement; import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Table; -import org.keycloak.models.Constants; public class JpaUpdate13_0_0_MigrateDefaultRoles extends CustomKeycloakTask { diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate14_0_0_MigrateSamlArtifactAttribute.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate14_0_0_MigrateSamlArtifactAttribute.java index 9b5afbc3497..df28109dc1a 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate14_0_0_MigrateSamlArtifactAttribute.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate14_0_0_MigrateSamlArtifactAttribute.java @@ -16,15 +16,15 @@ */ package org.keycloak.connections.jpa.updater.liquibase.custom; -import liquibase.exception.CustomChangeException; -import liquibase.statement.core.InsertStatement; -import liquibase.structure.core.Table; - import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.HashMap; import java.util.Map; +import liquibase.exception.CustomChangeException; +import liquibase.statement.core.InsertStatement; +import liquibase.structure.core.Table; + import static org.keycloak.protocol.saml.util.ArtifactBindingUtils.computeArtifactBindingIdentifierString; public class JpaUpdate14_0_0_MigrateSamlArtifactAttribute extends CustomKeycloakTask { diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java index d1ff82ad39e..594b46c8b08 100755 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_Beta1.java @@ -17,11 +17,12 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; -import liquibase.exception.CustomChangeException; -import liquibase.exception.DatabaseException; -import liquibase.statement.core.InsertStatement; -import liquibase.statement.core.UpdateStatement; -import liquibase.structure.core.Table; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.migration.MigrationProvider; import org.keycloak.models.AdminRoles; @@ -29,11 +30,11 @@ import org.keycloak.models.ClaimMask; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.ProtocolMapperRepresentation; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; -import java.util.Map; +import liquibase.exception.CustomChangeException; +import liquibase.exception.DatabaseException; +import liquibase.statement.core.InsertStatement; +import liquibase.statement.core.UpdateStatement; +import liquibase.structure.core.Table; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_CR1.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_CR1.java index 3b6617597b9..ee45ae876bf 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_CR1.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_2_0_CR1.java @@ -17,14 +17,14 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; +import java.sql.PreparedStatement; +import java.sql.ResultSet; + import liquibase.datatype.DataTypeFactory; import liquibase.exception.CustomChangeException; import liquibase.statement.core.InsertStatement; import liquibase.structure.core.Table; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - /** * @author Marek Posolda */ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java index 691bce23270..07cbcb06a11 100755 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_4_0_Final.java @@ -17,13 +17,14 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; +import java.sql.PreparedStatement; +import java.sql.ResultSet; + +import org.keycloak.models.utils.KeycloakModelUtils; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Table; -import org.keycloak.models.utils.KeycloakModelUtils; - -import java.sql.PreparedStatement; -import java.sql.ResultSet; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_9_0_Final.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_9_0_Final.java index 0e9a8c2c081..959c751f8e1 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_9_0_Final.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate1_9_0_Final.java @@ -17,13 +17,13 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; +import java.sql.PreparedStatement; +import java.sql.ResultSet; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Table; -import java.sql.PreparedStatement; -import java.sql.ResultSet; - /** * @author Marek Posolda */ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate21_0_2_TermsAndConditionsRequiredAction.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate21_0_2_TermsAndConditionsRequiredAction.java index ef458858a26..fc6939e7b96 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate21_0_2_TermsAndConditionsRequiredAction.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate21_0_2_TermsAndConditionsRequiredAction.java @@ -16,10 +16,11 @@ */ package org.keycloak.connections.jpa.updater.liquibase.custom; +import org.keycloak.models.UserModel; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Table; -import org.keycloak.models.UserModel; public class JpaUpdate21_0_2_TermsAndConditionsRequiredAction extends CustomKeycloakTask { diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate22_0_0_RemoveRhssoThemes.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate22_0_0_RemoveRhssoThemes.java index 29c7a667b05..b6ad5108e89 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate22_0_0_RemoveRhssoThemes.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate22_0_0_RemoveRhssoThemes.java @@ -16,11 +16,12 @@ */ package org.keycloak.connections.jpa.updater.liquibase.custom; +import org.keycloak.theme.DefaultThemeSelectorProvider; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.DeleteStatement; import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Table; -import org.keycloak.theme.DefaultThemeSelectorProvider; /** *

Migration class to remove old rh-sso themes.

diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate24_0_2_FederatedTermsAndConditionsRequiredAction.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate24_0_2_FederatedTermsAndConditionsRequiredAction.java index f217dc708a6..9c16221dcec 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate24_0_2_FederatedTermsAndConditionsRequiredAction.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate24_0_2_FederatedTermsAndConditionsRequiredAction.java @@ -16,10 +16,11 @@ */ package org.keycloak.connections.jpa.updater.liquibase.custom; +import org.keycloak.models.UserModel; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Table; -import org.keycloak.models.UserModel; /** * Custom liquibase change to migrate legacy {@code terms and conditions} required action for federated users (table diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate25_0_0_ConsentConstraints.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate25_0_0_ConsentConstraints.java index 98d3d4d594b..9dbee63686d 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate25_0_0_ConsentConstraints.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate25_0_0_ConsentConstraints.java @@ -64,4 +64,3 @@ public class JpaUpdate25_0_0_ConsentConstraints extends CustomKeycloakTask { } } - diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate25_0_0_MySQL_ConsentConstraints.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate25_0_0_MySQL_ConsentConstraints.java index 6b176766d57..2cfadfac96e 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate25_0_0_MySQL_ConsentConstraints.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate25_0_0_MySQL_ConsentConstraints.java @@ -79,5 +79,3 @@ public class JpaUpdate25_0_0_MySQL_ConsentConstraints extends CustomKeycloakTask } } - - diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_0_0_IdentityProviderAttributesMigration.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_0_0_IdentityProviderAttributesMigration.java index d006b8e3ca8..f3aade05d13 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_0_0_IdentityProviderAttributesMigration.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_0_0_IdentityProviderAttributesMigration.java @@ -19,12 +19,13 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; import java.sql.PreparedStatement; import java.sql.ResultSet; +import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.OrganizationModel; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.DeleteStatement; import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Table; -import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.OrganizationModel; /** * Custom SQL change to migrate the organization ID and the hide on login page config from the IDP config table to the diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_0_0_OrganizationGroupType.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_0_0_OrganizationGroupType.java index 4f1c080e183..d85506d30ad 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_0_0_OrganizationGroupType.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_0_0_OrganizationGroupType.java @@ -40,5 +40,3 @@ public class JpaUpdate26_0_0_OrganizationGroupType extends CustomKeycloakTask { } } - - diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_2_6_RemoveDuplicateMigrationModelTime.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_2_6_RemoveDuplicateMigrationModelTime.java index 2ed02eeb536..70939fb000c 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_2_6_RemoveDuplicateMigrationModelTime.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_2_6_RemoveDuplicateMigrationModelTime.java @@ -1,10 +1,5 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; -import liquibase.exception.CustomChangeException; -import liquibase.statement.core.DeleteStatement; -import liquibase.structure.core.Column; -import org.keycloak.migration.ModelVersion; - import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.HashMap; @@ -12,6 +7,12 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import org.keycloak.migration.ModelVersion; + +import liquibase.exception.CustomChangeException; +import liquibase.statement.core.DeleteStatement; +import liquibase.structure.core.Column; + /** * Cleanup script for removing duplicated migration model update time in the MIGRATION_MODEL table * See: keycloak#40088 diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_2_6_RemoveDuplicateMigrationModelVersion.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_2_6_RemoveDuplicateMigrationModelVersion.java index 220b3c88a50..712b59de941 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_2_6_RemoveDuplicateMigrationModelVersion.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate26_2_6_RemoveDuplicateMigrationModelVersion.java @@ -1,9 +1,5 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; -import liquibase.exception.CustomChangeException; -import liquibase.statement.core.DeleteStatement; -import liquibase.structure.core.Column; - import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.HashSet; @@ -11,6 +7,10 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import liquibase.exception.CustomChangeException; +import liquibase.statement.core.DeleteStatement; +import liquibase.structure.core.Column; + /** * Cleanup script for removing duplicated migration model versions in the MIGRATION_MODEL table * See: keycloak#39866 diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate4_0_0_DefaultClientScopes.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate4_0_0_DefaultClientScopes.java index 3a53f4a5aed..132f58349a6 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate4_0_0_DefaultClientScopes.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate4_0_0_DefaultClientScopes.java @@ -18,6 +18,7 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; import java.sql.PreparedStatement; import java.sql.ResultSet; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.InsertStatement; import liquibase.structure.core.Table; diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate4_7_0_OfflineSessionsTimestamps.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate4_7_0_OfflineSessionsTimestamps.java index 2aa1b1171d8..8a5c21bc5b9 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate4_7_0_OfflineSessionsTimestamps.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdate4_7_0_OfflineSessionsTimestamps.java @@ -17,10 +17,11 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; +import org.keycloak.common.util.Time; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Table; -import org.keycloak.common.util.Time; /** * Update CREATED_ON and LAST_SESSION_REFRESH columns to current startup time diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdateAuthz_3_4_0_CR1.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdateAuthz_3_4_0_CR1.java index 33306adb4bf..f1a3b6f9e39 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdateAuthz_3_4_0_CR1.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/JpaUpdateAuthz_3_4_0_CR1.java @@ -17,12 +17,11 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; -import liquibase.exception.CustomChangeException; -import liquibase.structure.core.Table; - import liquibase.database.core.MSSQLDatabase; +import liquibase.exception.CustomChangeException; import liquibase.statement.SqlStatement; import liquibase.statement.core.RawSqlStatement; +import liquibase.structure.core.Table; public class JpaUpdateAuthz_3_4_0_CR1 extends CustomKeycloakTask { diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/MigrateUserFedToComponent.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/MigrateUserFedToComponent.java index 645f929311d..50730b7b56a 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/MigrateUserFedToComponent.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/MigrateUserFedToComponent.java @@ -17,12 +17,13 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; -import liquibase.exception.CustomChangeException; +import java.util.function.Predicate; + import org.keycloak.models.LDAPConstants; import org.keycloak.provider.ProviderFactory; import org.keycloak.storage.UserStorageProvider; -import java.util.function.Predicate; +import liquibase.exception.CustomChangeException; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/PortLdapUserFedToComponentModel.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/PortLdapUserFedToComponentModel.java index 8d1e6795f48..f8fdd3a5416 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/PortLdapUserFedToComponentModel.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/PortLdapUserFedToComponentModel.java @@ -17,9 +17,10 @@ package org.keycloak.connections.jpa.updater.liquibase.custom; -import liquibase.exception.CustomChangeException; import org.keycloak.models.LDAPConstants; +import liquibase.exception.CustomChangeException; + /** * @author Bill Burke */ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/RemoveDuplicateOfflineSessions.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/RemoveDuplicateOfflineSessions.java index dc70444c20f..8a231c78059 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/RemoveDuplicateOfflineSessions.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/custom/RemoveDuplicateOfflineSessions.java @@ -23,6 +23,7 @@ import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; + import liquibase.exception.CustomChangeException; import liquibase.statement.core.DeleteStatement; import liquibase.structure.core.Column; diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomInitializeDatabaseChangeLogLockTableStatement.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomInitializeDatabaseChangeLogLockTableStatement.java index 6798439a467..4b42b56f6b6 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomInitializeDatabaseChangeLogLockTableStatement.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomInitializeDatabaseChangeLogLockTableStatement.java @@ -18,6 +18,7 @@ package org.keycloak.connections.jpa.updater.liquibase.lock; import java.util.Set; + import liquibase.statement.core.InitializeDatabaseChangeLogLockTableStatement; /** diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomInsertLockRecordGenerator.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomInsertLockRecordGenerator.java index 10681dd679c..f7cbedc4501 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomInsertLockRecordGenerator.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomInsertLockRecordGenerator.java @@ -17,22 +17,23 @@ package org.keycloak.connections.jpa.updater.liquibase.lock; -import liquibase.database.Database; -import liquibase.exception.ValidationErrors; -import liquibase.sql.Sql; -import liquibase.sqlgenerator.SqlGeneratorChain; -import liquibase.sqlgenerator.core.AbstractSqlGenerator; -import liquibase.statement.core.InitializeDatabaseChangeLogLockTableStatement; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import liquibase.sqlgenerator.SqlGeneratorFactory; -import liquibase.statement.core.InsertStatement; + import org.keycloak.models.dblock.DBLockProvider; +import liquibase.database.Database; +import liquibase.exception.ValidationErrors; +import liquibase.sql.Sql; +import liquibase.sqlgenerator.SqlGeneratorChain; +import liquibase.sqlgenerator.SqlGeneratorFactory; +import liquibase.sqlgenerator.core.AbstractSqlGenerator; +import liquibase.statement.core.InitializeDatabaseChangeLogLockTableStatement; +import liquibase.statement.core.InsertStatement; + /** * We need to remove DELETE SQL command, which liquibase adds by default when inserting record to table lock. This is causing buggy behaviour * diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomLockService.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomLockService.java index b7bc505a60e..b9f59c677fe 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomLockService.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/CustomLockService.java @@ -17,6 +17,18 @@ package org.keycloak.connections.jpa.updater.liquibase.lock; +import java.lang.reflect.Field; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import org.keycloak.common.util.Time; +import org.keycloak.common.util.reflections.Reflections; +import org.keycloak.connections.jpa.updater.liquibase.LiquibaseConstants; +import org.keycloak.models.dblock.DBLockProvider; + import liquibase.Scope; import liquibase.database.core.DerbyDatabase; import liquibase.exception.DatabaseException; @@ -28,6 +40,7 @@ import liquibase.snapshot.DatabaseSnapshot; import liquibase.snapshot.InvalidExampleException; import liquibase.snapshot.SnapshotControl; import liquibase.snapshot.SnapshotGeneratorFactory; +import liquibase.statement.SqlStatement; import liquibase.statement.core.CreateDatabaseChangeLogLockTableStatement; import liquibase.statement.core.DropTableStatement; import liquibase.statement.core.InitializeDatabaseChangeLogLockTableStatement; @@ -37,18 +50,6 @@ import liquibase.structure.core.PrimaryKey; import liquibase.structure.core.Schema; import liquibase.structure.core.Table; import org.jboss.logging.Logger; -import org.keycloak.common.util.Time; -import org.keycloak.common.util.reflections.Reflections; -import org.keycloak.connections.jpa.updater.liquibase.LiquibaseConstants; -import org.keycloak.models.dblock.DBLockProvider; - -import java.lang.reflect.Field; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import liquibase.statement.SqlStatement; /** * Liquibase lock service, which has some bugfixes and assumes timeouts to be configured in milliseconds diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/LiquibaseDBLockProvider.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/LiquibaseDBLockProvider.java index d20bbceacc7..954e91deb6c 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/LiquibaseDBLockProvider.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/LiquibaseDBLockProvider.java @@ -17,10 +17,9 @@ package org.keycloak.connections.jpa.updater.liquibase.lock; -import liquibase.Liquibase; -import liquibase.exception.DatabaseException; -import liquibase.exception.LiquibaseException; -import org.jboss.logging.Logger; +import java.sql.Connection; +import java.sql.SQLException; + import org.keycloak.common.util.Retry; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.connections.jpa.JpaConnectionProviderFactory; @@ -29,8 +28,10 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.dblock.DBLockProvider; import org.keycloak.models.utils.KeycloakModelUtils; -import java.sql.Connection; -import java.sql.SQLException; +import liquibase.Liquibase; +import liquibase.exception.DatabaseException; +import liquibase.exception.LiquibaseException; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/LiquibaseDBLockProviderFactory.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/LiquibaseDBLockProviderFactory.java index 64b25c75ab4..11b43c2b721 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/LiquibaseDBLockProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/updater/liquibase/lock/LiquibaseDBLockProviderFactory.java @@ -18,7 +18,7 @@ package org.keycloak.connections.jpa.updater.liquibase.lock; import java.util.List; -import org.jboss.logging.Logger; + import org.keycloak.Config; import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; @@ -27,6 +27,8 @@ import org.keycloak.models.dblock.DBLockProviderFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java b/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java index 6fd474ff5d8..98d0199e2da 100644 --- a/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java +++ b/model/jpa/src/main/java/org/keycloak/connections/jpa/util/JpaUtils.java @@ -17,23 +17,6 @@ package org.keycloak.connections.jpa.util; -import jakarta.persistence.PersistenceUnitTransactionType; -import jakarta.persistence.ValidationMode; -import org.hibernate.dialect.Dialect; -import org.hibernate.engine.jdbc.env.spi.IdentifierHelper; -import org.hibernate.internal.SessionFactoryImpl; -import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; -import org.hibernate.jpa.boot.spi.PersistenceXmlParser; -import org.jboss.logging.Logger; -import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; -import org.hibernate.jpa.boot.spi.Bootstrap; -import org.keycloak.connections.jpa.entityprovider.JpaEntityProvider; -import org.keycloak.models.KeycloakSession; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.EntityManagerFactory; - import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -47,6 +30,24 @@ import java.util.Properties; import java.util.Set; import java.util.stream.Collectors; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.PersistenceUnitTransactionType; +import jakarta.persistence.ValidationMode; + +import org.keycloak.connections.jpa.entityprovider.JpaEntityProvider; +import org.keycloak.models.KeycloakSession; + +import org.hibernate.dialect.Dialect; +import org.hibernate.engine.jdbc.env.spi.IdentifierHelper; +import org.hibernate.engine.spi.SessionFactoryImplementor; +import org.hibernate.internal.SessionFactoryImpl; +import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; +import org.hibernate.jpa.boot.spi.Bootstrap; +import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; +import org.hibernate.jpa.boot.spi.PersistenceXmlParser; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java index e56cf06bbfe..09c1ef3a8bc 100755 --- a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java +++ b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java @@ -17,11 +17,11 @@ package org.keycloak.events.jpa; -import org.hibernate.jpa.AvailableHints; -import org.keycloak.events.admin.AdminEvent; -import org.keycloak.events.admin.AdminEventQuery; -import org.keycloak.events.admin.OperationType; -import org.keycloak.events.admin.ResourceType; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Stream; import jakarta.persistence.EntityManager; import jakarta.persistence.TypedQuery; @@ -30,11 +30,13 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Expression; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Stream; + +import org.keycloak.events.admin.AdminEvent; +import org.keycloak.events.admin.AdminEventQuery; +import org.keycloak.events.admin.OperationType; +import org.keycloak.events.admin.ResourceType; + +import org.hibernate.jpa.AvailableHints; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java index 2fc7e383d59..ad076f059ff 100644 --- a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java +++ b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventQuery.java @@ -17,17 +17,6 @@ package org.keycloak.events.jpa; -import org.hibernate.jpa.AvailableHints; -import org.keycloak.events.Event; -import org.keycloak.events.EventQuery; -import org.keycloak.events.EventType; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.TypedQuery; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Predicate; -import jakarta.persistence.criteria.Root; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -36,6 +25,19 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Stream; +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; + +import org.keycloak.events.Event; +import org.keycloak.events.EventQuery; +import org.keycloak.events.EventType; + +import org.hibernate.jpa.AvailableHints; + import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java index 42d96a265f0..0250c61d973 100755 --- a/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java +++ b/model/jpa/src/main/java/org/keycloak/events/jpa/JpaEventStoreProvider.java @@ -17,7 +17,16 @@ package org.keycloak.events.jpa; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.function.Consumer; +import java.util.stream.Collectors; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.TypedQuery; + import org.keycloak.common.util.Time; import org.keycloak.events.Event; import org.keycloak.events.EventQuery; @@ -32,17 +41,9 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.jpa.entities.RealmAttributeEntity; import org.keycloak.models.jpa.entities.RealmAttributes; import org.keycloak.models.jpa.entities.RealmEntity; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.TypedQuery; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.function.Consumer; -import java.util.stream.Collectors; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java index e5ce9f95971..7f6225215a2 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientAdapter.java @@ -17,6 +17,19 @@ package org.keycloak.models.jpa; +import java.security.MessageDigest; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Stream; + +import jakarta.persistence.EntityManager; + import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; @@ -31,19 +44,6 @@ import org.keycloak.models.jpa.entities.ProtocolMapperEntity; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RoleUtils; -import jakarta.persistence.EntityManager; - -import java.security.MessageDigest; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientScopeAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientScopeAdapter.java index 8a2def33212..422c7abbe8e 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/ClientScopeAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/ClientScopeAdapter.java @@ -17,6 +17,15 @@ package org.keycloak.models.jpa; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Stream; + +import jakarta.persistence.EntityManager; + import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelDuplicateException; @@ -30,15 +39,6 @@ import org.keycloak.models.jpa.entities.ProtocolMapperEntity; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RoleUtils; -import jakarta.persistence.EntityManager; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java index 0ed3b5f666e..fdb30708ccd 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/GroupAdapter.java @@ -17,10 +17,21 @@ package org.keycloak.models.jpa; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Stream; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TypedQuery; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluationStorageProvider; import org.keycloak.common.util.MultivaluedHashMap; @@ -34,19 +45,10 @@ import org.keycloak.models.jpa.entities.GroupEntity; import org.keycloak.models.jpa.entities.GroupRoleMappingEntity; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RoleUtils; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.TypedQuery; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Stream; -import jakarta.persistence.LockModeType; import org.keycloak.storage.UserStoragePrivateUtil; import static java.util.Optional.ofNullable; + import static org.keycloak.common.util.CollectionUtil.collectionEquals; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientProviderFactory.java index 3c6385e52b0..7f4b1377d25 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientProviderFactory.java @@ -17,6 +17,15 @@ package org.keycloak.models.jpa; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; + +import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.common.Profile; @@ -29,13 +38,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.jpa.entities.RealmAttributes; import org.keycloak.protocol.saml.SamlConfigAttributes; -import jakarta.persistence.EntityManager; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientScopeProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientScopeProviderFactory.java index bfb1ee2f26c..4c8d915b141 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientScopeProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaClientScopeProviderFactory.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa; +import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.ClientScopeProvider; @@ -24,7 +26,6 @@ import org.keycloak.models.ClientScopeProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import jakarta.persistence.EntityManager; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaDeploymentStateProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaDeploymentStateProviderFactory.java index a3ce6af3425..be6b34290b9 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaDeploymentStateProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaDeploymentStateProviderFactory.java @@ -18,14 +18,16 @@ package org.keycloak.models.jpa; import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; -import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; import org.keycloak.models.DeploymentStateProvider; import org.keycloak.models.DeploymentStateProviderFactory; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; + +import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; +import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; public class JpaDeploymentStateProviderFactory implements DeploymentStateProviderFactory { diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaGroupProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaGroupProviderFactory.java index a80980140e2..17ff6fb1635 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaGroupProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaGroupProviderFactory.java @@ -17,6 +17,14 @@ package org.keycloak.models.jpa; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.GroupProvider; @@ -24,17 +32,10 @@ import org.keycloak.models.GroupProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; - -import jakarta.persistence.EntityManager; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import org.keycloak.provider.ProviderConfigurationBuilder; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; -import org.keycloak.provider.ProviderConfigurationBuilder; public class JpaGroupProviderFactory implements GroupProviderFactory { diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaIdentityProviderStorageProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaIdentityProviderStorageProvider.java index 15119de061f..91951a11368 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaIdentityProviderStorageProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaIdentityProviderStorageProvider.java @@ -16,7 +16,6 @@ */ package org.keycloak.models.jpa; -import jakarta.persistence.criteria.JoinType; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -30,23 +29,23 @@ import jakarta.persistence.TypedQuery; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaDelete; import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.JoinType; import jakarta.persistence.criteria.MapJoin; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import org.hibernate.Session; -import org.jboss.logging.Logger; -import org.keycloak.models.IdentityProviderQuery; -import org.keycloak.models.IdentityProviderType; + import org.keycloak.broker.provider.IdentityProvider; import org.keycloak.broker.provider.IdentityProviderFactory; import org.keycloak.broker.provider.util.IdentityProviderTypeUtil; import org.keycloak.broker.social.SocialIdentityProvider; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.IdentityProviderMapperModel; +import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderQuery; import org.keycloak.models.IdentityProviderShowInAccountConsole; import org.keycloak.models.IdentityProviderStorageProvider; -import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelException; import org.keycloak.models.RealmModel; @@ -55,6 +54,9 @@ import org.keycloak.models.jpa.entities.IdentityProviderMapperEntity; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.utils.StringUtil; +import org.hibernate.Session; +import org.jboss.logging.Logger; + import static org.keycloak.models.IdentityProviderModel.ALIAS; import static org.keycloak.models.IdentityProviderModel.ALIAS_NOT_IN; import static org.keycloak.models.IdentityProviderModel.AUTHENTICATE_BY_DEFAULT; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java index be759fad02c..0c2717b86da 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java @@ -17,21 +17,6 @@ package org.keycloak.models.jpa; -import static org.keycloak.common.util.StackUtil.getShortStackTrace; -import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; -import static org.keycloak.utils.StreamsUtil.closing; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.LockModeType; -import jakarta.persistence.TypedQuery; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaDelete; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Join; -import jakarta.persistence.criteria.JoinType; -import jakarta.persistence.criteria.MapJoin; -import jakarta.persistence.criteria.Predicate; -import jakarta.persistence.criteria.Root; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -44,8 +29,18 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.hibernate.Session; -import org.jboss.logging.Logger; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaDelete; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.MapJoin; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.client.clienttype.ClientTypeManager; import org.keycloak.common.Profile; @@ -86,6 +81,13 @@ import org.keycloak.models.jpa.entities.RoleEntity; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.oidc.OIDCLoginProtocol; +import org.hibernate.Session; +import org.jboss.logging.Logger; + +import static org.keycloak.common.util.StackUtil.getShortStackTrace; +import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; +import static org.keycloak.utils.StreamsUtil.closing; + /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProviderFactory.java index 7947b608774..33cabcf90d6 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProviderFactory.java @@ -17,16 +17,16 @@ package org.keycloak.models.jpa; +import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; +import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.RealmProviderFactory; - -import jakarta.persistence.EntityManager; -import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RealmProvider; +import org.keycloak.models.RealmProviderFactory; import org.keycloak.models.RoleContainerModel; import org.keycloak.models.RoleContainerModel.RoleRemovedEvent; import org.keycloak.models.RoleModel; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRoleProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRoleProviderFactory.java index 5f614b1b44f..56c37808b5c 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRoleProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaRoleProviderFactory.java @@ -17,14 +17,15 @@ package org.keycloak.models.jpa; +import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; -import org.keycloak.models.RoleProvider; -import org.keycloak.models.RoleProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.RoleProvider; +import org.keycloak.models.RoleProviderFactory; -import jakarta.persistence.EntityManager; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStore.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStore.java index 666a66cd7bc..0ca5b44522e 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStore.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStore.java @@ -16,7 +16,16 @@ */ package org.keycloak.models.jpa; -import org.jboss.logging.Logger; +import java.util.Base64; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TypedQuery; + import org.keycloak.credential.CredentialModel; import org.keycloak.credential.UserCredentialStore; import org.keycloak.models.KeycloakSession; @@ -27,15 +36,7 @@ import org.keycloak.models.jpa.entities.CredentialEntity; import org.keycloak.models.jpa.entities.UserEntity; import org.keycloak.models.utils.KeycloakModelUtils; -import jakarta.persistence.EntityManager; -import jakarta.persistence.LockModeType; -import jakarta.persistence.TypedQuery; - -import java.util.Base64; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStoreFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStoreFactory.java index ed976352b00..e36a87cf63f 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStoreFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserCredentialStoreFactory.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa; +import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.credential.UserCredentialStore; @@ -24,7 +26,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderFactory; -import jakarta.persistence.EntityManager; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserPartialEvaluationProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserPartialEvaluationProvider.java index 334a3dc1057..874e9a2dac3 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserPartialEvaluationProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserPartialEvaluationProvider.java @@ -17,9 +17,6 @@ package org.keycloak.models.jpa; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; - import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -34,16 +31,20 @@ import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; import jakarta.persistence.criteria.Subquery; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; -import org.keycloak.authorization.jpa.entities.ResourceEntity; import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluationContext; import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluationStorageProvider; +import org.keycloak.authorization.jpa.entities.ResourceEntity; import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.jpa.entities.UserGroupMembershipEntity; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; + /** * A {@link PartialEvaluationStorageProvider} that provides support for partial evaluation when querying {@link UserModel}. */ diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProvider.java index efb2ae359ec..ae0f135255c 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProvider.java @@ -17,7 +17,30 @@ package org.keycloak.models.jpa; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Stream; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.From; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.common.util.Time; import org.keycloak.component.ComponentModel; @@ -51,32 +74,9 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.storage.StorageId; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.client.ClientStorageProvider; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.LockModeType; -import jakarta.persistence.TypedQuery; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Expression; -import jakarta.persistence.criteria.From; -import jakarta.persistence.criteria.Join; -import jakarta.persistence.criteria.JoinType; -import jakarta.persistence.criteria.Predicate; -import jakarta.persistence.criteria.Root; import org.keycloak.storage.jpa.JpaHashUtils; import org.keycloak.utils.StringUtil; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Stream; - import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.storage.jpa.JpaHashUtils.predicateForFilteringUsersByAttributes; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProviderFactory.java index e80553952d6..1b9f3f0aec2 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/JpaUserProviderFactory.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa; +import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; @@ -24,7 +26,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.UserProvider; import org.keycloak.models.UserProviderFactory; -import jakarta.persistence.EntityManager; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_ID; import static org.keycloak.models.jpa.JpaRealmProviderFactory.PROVIDER_PRIORITY; 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 4f7a9605b86..b35fad5e756 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 @@ -17,14 +17,15 @@ package org.keycloak.models.jpa; -import org.keycloak.common.util.Time; -import org.keycloak.migration.MigrationModel; -import org.keycloak.models.jpa.entities.MigrationModelEntity; +import java.security.SecureRandom; +import java.util.List; import jakarta.persistence.EntityManager; import jakarta.persistence.TypedQuery; -import java.security.SecureRandom; -import java.util.List; + +import org.keycloak.common.util.Time; +import org.keycloak.migration.MigrationModel; +import org.keycloak.models.jpa.entities.MigrationModelEntity; /** * @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 fd289c6805d..f00c5d18cab 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 @@ -17,8 +17,25 @@ package org.keycloak.models.jpa; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Stream; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TypedQuery; + import org.keycloak.Config; -import org.jboss.logging.Logger; import org.keycloak.authentication.RequiredActionFactory; import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.common.enums.SslRequired; @@ -35,6 +52,7 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.Constants; import org.keycloak.models.GroupModel; +import org.keycloak.models.GroupModel.GroupUpdatedEvent; import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.IdentityProviderQuery; @@ -54,7 +72,6 @@ import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.WebAuthnPolicy; import org.keycloak.models.WebAuthnPolicyPasswordlessDefaults; import org.keycloak.models.WebAuthnPolicyTwoFactorDefaults; -import org.keycloak.models.GroupModel.GroupUpdatedEvent; import org.keycloak.models.jpa.entities.AuthenticationExecutionEntity; import org.keycloak.models.jpa.entities.AuthenticationFlowEntity; import org.keycloak.models.jpa.entities.AuthenticatorConfigEntity; @@ -72,27 +89,12 @@ import org.keycloak.models.jpa.entities.RequiredCredentialEntity; import org.keycloak.models.utils.ComponentUtil; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.ProviderConfigProperty; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.LockModeType; -import jakarta.persistence.TypedQuery; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.Collections; -import java.util.Collection; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Arrays; -import java.util.function.Predicate; -import java.util.stream.Stream; +import org.jboss.logging.Logger; import static java.util.Objects.nonNull; + import static org.keycloak.utils.StreamsUtil.closing; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/RoleAdapter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/RoleAdapter.java index d56f55fd937..fd9a9db9a15 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/RoleAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/RoleAdapter.java @@ -17,16 +17,6 @@ package org.keycloak.models.jpa; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleContainerModel; -import org.keycloak.models.RoleModel; -import org.keycloak.models.jpa.entities.RoleAttributeEntity; -import org.keycloak.models.jpa.entities.RoleEntity; -import org.keycloak.models.utils.KeycloakModelUtils; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.Query; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -36,6 +26,17 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Stream; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; + +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.models.RoleContainerModel; +import org.keycloak.models.RoleModel; +import org.keycloak.models.jpa.entities.RoleAttributeEntity; +import org.keycloak.models.jpa.entities.RoleEntity; +import org.keycloak.models.utils.KeycloakModelUtils; + /** * @author Bill Burke * @version $Revision: 1 $ 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 dcd25c3b4a9..4627f0cfa5a 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 @@ -17,6 +17,25 @@ package org.keycloak.models.jpa; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; + import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; import org.keycloak.common.util.CollectionUtil; @@ -26,8 +45,8 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.GroupModel; import org.keycloak.models.GroupModel.GroupMemberJoinEvent; import org.keycloak.models.GroupModel.GroupMemberLeaveEvent; -import org.keycloak.models.MembershipMetadata; import org.keycloak.models.KeycloakSession; +import org.keycloak.models.MembershipMetadata; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.RoleModel.RoleGrantedEvent; @@ -41,26 +60,7 @@ 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.RoleUtils; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.LockModeType; -import jakarta.persistence.Query; -import jakarta.persistence.TypedQuery; -import jakarta.persistence.criteria.CriteriaBuilder; -import jakarta.persistence.criteria.CriteriaQuery; -import jakarta.persistence.criteria.Predicate; -import jakarta.persistence.criteria.Root; import org.keycloak.organization.OrganizationProvider; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; import org.keycloak.representations.idm.MembershipType; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/converter/MapStringConverter.java b/model/jpa/src/main/java/org/keycloak/models/jpa/converter/MapStringConverter.java index 7d2ae840ea4..96f82961bd6 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/converter/MapStringConverter.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/converter/MapStringConverter.java @@ -19,10 +19,13 @@ package org.keycloak.models.jpa.converter; import java.io.IOException; import java.util.Map; + import jakarta.persistence.AttributeConverter; -import org.jboss.logging.Logger; + import org.keycloak.util.JsonSerialization; +import org.jboss.logging.Logger; + public class MapStringConverter implements AttributeConverter, String> { private static final Logger logger = Logger.getLogger(MapStringConverter.class); diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationExecutionEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationExecutionEntity.java index 206f06f41ae..d044bfa44f5 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationExecutionEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationExecutionEntity.java @@ -17,8 +17,6 @@ package org.keycloak.models.jpa.entities; -import org.keycloak.models.AuthenticationExecutionModel; - import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.Column; @@ -31,6 +29,8 @@ import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; +import org.keycloak.models.AuthenticationExecutionModel; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationFlowEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationFlowEntity.java index 85c844c2da5..5da435c2cfd 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationFlowEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticationFlowEntity.java @@ -17,7 +17,8 @@ package org.keycloak.models.jpa.entities; -import org.hibernate.annotations.Nationalized; +import java.util.Collection; +import java.util.LinkedList; import jakarta.persistence.Access; import jakarta.persistence.AccessType; @@ -30,8 +31,8 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import java.util.Collection; -import java.util.LinkedList; + +import org.hibernate.annotations.Nationalized; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticatorConfigEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticatorConfigEntity.java index 095a0673494..b6d159001b3 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticatorConfigEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/AuthenticatorConfigEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.util.Map; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CollectionTable; @@ -29,7 +31,6 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.MapKeyColumn; import jakarta.persistence.Table; -import java.util.Map; import jakarta.persistence.UniqueConstraint; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java index 2a60706e99d..e0ccd6d6e63 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java @@ -17,7 +17,12 @@ package org.keycloak.models.jpa.entities; -import org.hibernate.annotations.Nationalized; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Map; +import java.util.Set; import jakarta.persistence.Access; import jakarta.persistence.AccessType; @@ -34,12 +39,8 @@ import jakarta.persistence.NamedQuery; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Map; -import java.util.Set; + +import org.hibernate.annotations.Nationalized; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeRoleMappingEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeRoleMappingEntity.java index 2f0737193ac..2c35ef389ae 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeRoleMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientScopeRoleMappingEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.io.Serializable; + import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.Id; @@ -26,7 +28,6 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentConfigEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentConfigEntity.java index c2a693760ce..600b3e35c6d 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentConfigEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ComponentConfigEntity.java @@ -17,8 +17,6 @@ package org.keycloak.models.jpa.entities; -import org.hibernate.annotations.Nationalized; - import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.Column; @@ -29,6 +27,8 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; +import org.hibernate.annotations.Nationalized; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/FederatedIdentityEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/FederatedIdentityEntity.java index b1d091d6437..2c2c9568027 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/FederatedIdentityEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/FederatedIdentityEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.io.Serializable; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -27,7 +29,6 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupAttributeEntity.java index c7d2c700569..2ce43b422a9 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupAttributeEntity.java @@ -17,8 +17,6 @@ package org.keycloak.models.jpa.entities; -import org.hibernate.annotations.Nationalized; - import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.Column; @@ -31,6 +29,8 @@ import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; +import org.hibernate.annotations.Nationalized; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java index 6df4f76f739..7ed7df60a4f 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupEntity.java @@ -17,7 +17,8 @@ package org.keycloak.models.jpa.entities; -import org.hibernate.annotations.Nationalized; +import java.util.Collection; +import java.util.LinkedList; import jakarta.persistence.Access; import jakarta.persistence.AccessType; @@ -30,8 +31,8 @@ import jakarta.persistence.NamedQuery; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import java.util.Collection; -import java.util.LinkedList; + +import org.hibernate.annotations.Nationalized; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupRoleMappingEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupRoleMappingEntity.java index 4f85c20f53a..53b2db509ca 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupRoleMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/GroupRoleMappingEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.io.Serializable; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -27,7 +29,6 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderEntity.java index 1b5f37d1f3a..126f030dd16 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.util.Map; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CollectionTable; @@ -27,7 +29,6 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.MapKeyColumn; import jakarta.persistence.Table; -import java.util.Map; /** * @author Pedro Igor diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderMapperEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderMapperEntity.java index 7d25bdd4695..ce5c49e393d 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderMapperEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/IdentityProviderMapperEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.util.Map; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CollectionTable; @@ -27,7 +29,6 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.MapKeyColumn; import jakarta.persistence.Table; -import java.util.Map; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/OrganizationEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/OrganizationEntity.java index daf10a63748..d8262525cd3 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/OrganizationEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/OrganizationEntity.java @@ -31,6 +31,7 @@ import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; + import org.keycloak.utils.StringUtil; @Table(name="ORG") diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java index 1335ce21b3d..49f2618ab6e 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ProtocolMapperEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.util.Map; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CollectionTable; @@ -29,7 +31,6 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.MapKeyColumn; import jakarta.persistence.Table; -import java.util.Map; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmAttributeEntity.java index 55f1e9330b7..11551deeb50 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmAttributeEntity.java @@ -17,7 +17,7 @@ package org.keycloak.models.jpa.entities; -import org.hibernate.annotations.Nationalized; +import java.io.Serializable; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -29,7 +29,8 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; + +import org.hibernate.annotations.Nationalized; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java index 6709fd9141e..f52fd9be102 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmEntity.java @@ -17,6 +17,14 @@ package org.keycloak.models.jpa.entities; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CascadeType; @@ -33,13 +41,6 @@ import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; /** * @author Bill Burke @@ -822,4 +823,3 @@ public class RealmEntity { return id.hashCode(); } } - diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmLocalizationTextsEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmLocalizationTextsEntity.java index 2e6f08de66c..9a7ed44d231 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmLocalizationTextsEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmLocalizationTextsEntity.java @@ -20,6 +20,7 @@ package org.keycloak.models.jpa.entities; import java.io.Serializable; import java.util.Map; import java.util.Objects; + import jakarta.persistence.Column; import jakarta.persistence.Convert; import jakarta.persistence.Entity; @@ -30,9 +31,10 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; -import org.hibernate.annotations.Nationalized; import org.keycloak.models.jpa.converter.MapStringConverter; +import org.hibernate.annotations.Nationalized; + @Entity @IdClass(RealmLocalizationTextsEntity.RealmLocalizationTextEntityKey.class) @Table(name = "REALM_LOCALIZATIONS") diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredActionProviderEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredActionProviderEntity.java index edc8bdbaf33..d565d9ac705 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredActionProviderEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredActionProviderEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.util.Map; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CollectionTable; @@ -31,7 +33,6 @@ import jakarta.persistence.MapKeyColumn; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.util.Map; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentialEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentialEntity.java index cf54e8334f8..eb1b5d68da1 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentialEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RequiredCredentialEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.io.Serializable; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -25,7 +27,6 @@ import jakarta.persistence.IdClass; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; -import java.io.Serializable; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleAttributeEntity.java index 9414c0812cb..2688ce654e3 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleAttributeEntity.java @@ -17,8 +17,6 @@ package org.keycloak.models.jpa.entities; -import org.hibernate.annotations.Nationalized; - import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.Column; @@ -31,6 +29,8 @@ import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; +import org.hibernate.annotations.Nationalized; + /** * @author Leon Graser */ diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java index b2583d848be..729b5f4a46f 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java @@ -17,10 +17,10 @@ package org.keycloak.models.jpa.entities; -import org.hibernate.annotations.BatchSize; -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; -import org.hibernate.annotations.Nationalized; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; import jakarta.persistence.Access; import jakarta.persistence.AccessType; @@ -37,10 +37,11 @@ import jakarta.persistence.NamedQuery; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; + +import org.hibernate.annotations.BatchSize; +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; +import org.hibernate.annotations.Nationalized; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserAttributeEntity.java index ccac0be5db2..23fbdb668d3 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserAttributeEntity.java @@ -17,8 +17,6 @@ package org.keycloak.models.jpa.entities; -import org.hibernate.annotations.Nationalized; - import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.Column; @@ -30,8 +28,11 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; + import org.keycloak.storage.jpa.JpaHashUtils; +import org.hibernate.annotations.Nationalized; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentEntity.java index ca1faecc9a4..366a42b1203 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserConsentEntity.java @@ -17,6 +17,9 @@ package org.keycloak.models.jpa.entities; +import java.util.Collection; +import java.util.LinkedList; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CascadeType; @@ -31,8 +34,6 @@ import jakarta.persistence.NamedQuery; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import java.util.Collection; -import java.util.LinkedList; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java index 42b63e57e8a..cd0944476a2 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserEntity.java @@ -17,11 +17,8 @@ package org.keycloak.models.jpa.entities; -import org.hibernate.annotations.BatchSize; -import org.hibernate.annotations.Fetch; -import org.hibernate.annotations.FetchMode; -import org.hibernate.annotations.Nationalized; -import org.keycloak.models.utils.KeycloakModelUtils; +import java.util.Collection; +import java.util.LinkedList; import jakarta.persistence.Access; import jakarta.persistence.AccessType; @@ -34,8 +31,13 @@ import jakarta.persistence.NamedQuery; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import java.util.Collection; -import java.util.LinkedList; + +import org.keycloak.models.utils.KeycloakModelUtils; + +import org.hibernate.annotations.BatchSize; +import org.hibernate.annotations.Fetch; +import org.hibernate.annotations.FetchMode; +import org.hibernate.annotations.Nationalized; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationMapperEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationMapperEntity.java index eef203bf443..adf5f4f0ebd 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationMapperEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationMapperEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.util.Map; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CollectionTable; @@ -29,7 +31,6 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.MapKeyColumn; import jakarta.persistence.Table; -import java.util.Map; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationProviderEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationProviderEntity.java index 8178fbcbcc5..037e9a0c367 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationProviderEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserFederationProviderEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.util.Map; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CollectionTable; @@ -29,7 +31,6 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.MapKeyColumn; import jakarta.persistence.Table; -import java.util.Map; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserGroupMembershipEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserGroupMembershipEntity.java index 7d668d78216..b089a82d11e 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserGroupMembershipEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserGroupMembershipEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.io.Serializable; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -27,7 +29,7 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; + import org.keycloak.representations.idm.MembershipType; /** diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java index 02cc464b4b7..141c26de875 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRequiredActionEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.io.Serializable; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -27,7 +29,6 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java index ab2f800b336..c2a5b994c7b 100755 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/UserRoleMappingEntity.java @@ -17,6 +17,8 @@ package org.keycloak.models.jpa.entities; +import java.io.Serializable; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -27,7 +29,6 @@ import jakarta.persistence.ManyToOne; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaRevokedTokensPersisterProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaRevokedTokensPersisterProvider.java index 38e74c26b1c..de1f1ada68c 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaRevokedTokensPersisterProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaRevokedTokensPersisterProvider.java @@ -17,19 +17,20 @@ package org.keycloak.models.jpa.session; +import java.util.stream.Stream; + import jakarta.persistence.EntityManager; import jakarta.persistence.TypedQuery; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaDelete; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Root; + import org.keycloak.common.util.Time; import org.keycloak.models.jpa.entities.RevokedTokenEntity; import org.keycloak.models.session.RevokedToken; import org.keycloak.models.session.RevokedTokenPersisterProvider; -import java.util.stream.Stream; - /** * @author Alexander Schwartz */ diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaRevokedTokensPersisterProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaRevokedTokensPersisterProviderFactory.java index ef6339f8bcb..f3ba1b920f3 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaRevokedTokensPersisterProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaRevokedTokensPersisterProviderFactory.java @@ -18,6 +18,7 @@ package org.keycloak.models.jpa.session; import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProvider.java b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProvider.java index 49af17b402d..f754d7fa6a5 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProvider.java @@ -17,8 +17,23 @@ package org.keycloak.models.jpa.session; -import org.hibernate.jpa.AvailableHints; -import org.jboss.logging.Logger; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.Query; +import jakarta.persistence.TypedQuery; + import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.common.util.Time; import org.keycloak.connections.jpa.JpaConnectionProvider; @@ -41,25 +56,11 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.SessionExpirationUtils; import org.keycloak.models.utils.SessionTimeoutHelper; import org.keycloak.storage.StorageId; - -import jakarta.persistence.EntityManager; -import jakarta.persistence.Query; -import jakarta.persistence.TypedQuery; - -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import jakarta.persistence.LockModeType; import org.keycloak.utils.StreamsUtil; +import org.hibernate.jpa.AvailableHints; +import org.jboss.logging.Logger; + import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProviderFactory.java index 6464396d5e5..e7008ff2890 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/session/JpaUserSessionPersisterProviderFactory.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Set; import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentClientSessionEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentClientSessionEntity.java index ee29097700c..efe34ca6915 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentClientSessionEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentClientSessionEntity.java @@ -17,6 +17,9 @@ package org.keycloak.models.jpa.session; +import java.io.Serializable; +import java.util.Objects; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; @@ -25,10 +28,8 @@ import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; import jakarta.persistence.Version; -import org.hibernate.annotations.DynamicUpdate; -import java.io.Serializable; -import java.util.Objects; +import org.hibernate.annotations.DynamicUpdate; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentUserSessionEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentUserSessionEntity.java index ca74e058e50..1639df89700 100644 --- a/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentUserSessionEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/jpa/session/PersistentUserSessionEntity.java @@ -17,9 +17,8 @@ package org.keycloak.models.jpa.session; -import jakarta.persistence.Version; -import org.hibernate.annotations.DynamicUpdate; -import org.keycloak.storage.jpa.KeyUtils; +import java.io.Serializable; +import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -28,8 +27,11 @@ import jakarta.persistence.IdClass; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; -import java.util.Objects; +import jakarta.persistence.Version; + +import org.keycloak.storage.jpa.KeyUtils; + +import org.hibernate.annotations.DynamicUpdate; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/DefaultWorkflowExecutionContext.java b/model/jpa/src/main/java/org/keycloak/models/workflow/DefaultWorkflowExecutionContext.java index d8979b0c425..57d5fa0c0f6 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/DefaultWorkflowExecutionContext.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/DefaultWorkflowExecutionContext.java @@ -2,10 +2,11 @@ package org.keycloak.models.workflow; import java.util.UUID; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.models.workflow.WorkflowStateProvider.ScheduledStep; +import org.jboss.logging.Logger; + final class DefaultWorkflowExecutionContext implements WorkflowExecutionContext { private static final Logger log = Logger.getLogger(DefaultWorkflowExecutionContext.class); @@ -107,4 +108,3 @@ final class DefaultWorkflowExecutionContext implements WorkflowExecutionContext return session; } } - diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/DefaultWorkflowProvider.java b/model/jpa/src/main/java/org/keycloak/models/workflow/DefaultWorkflowProvider.java index 6736e846c54..7c0aef7fcc8 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/DefaultWorkflowProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/DefaultWorkflowProvider.java @@ -1,9 +1,5 @@ package org.keycloak.models.workflow; -import static java.util.Optional.ofNullable; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_ENABLED; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_NAME; - import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -15,7 +11,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import jakarta.ws.rs.BadRequestException; -import org.jboss.logging.Logger; + import org.keycloak.common.util.DurationConverter; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentFactory; @@ -30,6 +26,13 @@ import org.keycloak.representations.workflows.WorkflowRepresentation; import org.keycloak.representations.workflows.WorkflowStepRepresentation; import org.keycloak.utils.StringUtil; +import org.jboss.logging.Logger; + +import static java.util.Optional.ofNullable; + +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_ENABLED; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_NAME; + public class DefaultWorkflowProvider implements WorkflowProvider { private static final Logger log = Logger.getLogger(DefaultWorkflowProvider.class); diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/EventBasedWorkflow.java b/model/jpa/src/main/java/org/keycloak/models/workflow/EventBasedWorkflow.java index 1fde1a40f2f..87b11e53e44 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/EventBasedWorkflow.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/EventBasedWorkflow.java @@ -1,9 +1,5 @@ package org.keycloak.models.workflow; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_CANCEL_IF_RUNNING; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_CONDITIONS; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_ON_EVENT; - import java.util.List; import org.keycloak.component.ComponentModel; @@ -14,6 +10,10 @@ import org.keycloak.models.workflow.conditions.expression.EvaluatorUtils; import org.keycloak.models.workflow.conditions.expression.EventEvaluator; import org.keycloak.utils.StringUtil; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_CANCEL_IF_RUNNING; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_CONDITIONS; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_ON_EVENT; + final class EventBasedWorkflow { private final KeycloakSession session; diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/JpaWorkflowStateProvider.java b/model/jpa/src/main/java/org/keycloak/models/workflow/JpaWorkflowStateProvider.java index af726d9caef..e7ef10bf686 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/JpaWorkflowStateProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/JpaWorkflowStateProvider.java @@ -17,13 +17,17 @@ package org.keycloak.models.workflow; +import java.time.Duration; +import java.time.Instant; +import java.util.List; + import jakarta.persistence.EntityManager; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaDelete; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; -import org.jboss.logging.Logger; + import org.keycloak.common.util.DurationConverter; import org.keycloak.common.util.Time; import org.keycloak.connections.jpa.JpaConnectionProvider; @@ -31,9 +35,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.utils.StringUtil; -import java.time.Duration; -import java.time.Instant; -import java.util.List; +import org.jboss.logging.Logger; public class JpaWorkflowStateProvider implements WorkflowStateProvider { diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/RestartWorkflowStepProvider.java b/model/jpa/src/main/java/org/keycloak/models/workflow/RestartWorkflowStepProvider.java index 5528aa7359a..73798395129 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/RestartWorkflowStepProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/RestartWorkflowStepProvider.java @@ -16,4 +16,3 @@ public class RestartWorkflowStepProvider implements WorkflowStepProvider { // No resources to close } } - diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/RestartWorkflowStepProviderFactory.java b/model/jpa/src/main/java/org/keycloak/models/workflow/RestartWorkflowStepProviderFactory.java index 982e90432bf..c02cc033750 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/RestartWorkflowStepProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/RestartWorkflowStepProviderFactory.java @@ -53,4 +53,3 @@ public class RestartWorkflowStepProviderFactory implements WorkflowStepProviderF return "Restarts the current workflow"; } } - diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/RunWorkflowTask.java b/model/jpa/src/main/java/org/keycloak/models/workflow/RunWorkflowTask.java index f7365911d78..324d1af88c5 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/RunWorkflowTask.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/RunWorkflowTask.java @@ -2,10 +2,11 @@ package org.keycloak.models.workflow; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.common.util.DurationConverter; import org.keycloak.models.KeycloakSession; +import org.jboss.logging.Logger; + class RunWorkflowTask extends WorkflowTransactionalTask { private static final Logger log = Logger.getLogger(RunWorkflowTask.class); diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/ScheduleWorkflowTask.java b/model/jpa/src/main/java/org/keycloak/models/workflow/ScheduleWorkflowTask.java index 693c852fb24..b6d05493541 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/ScheduleWorkflowTask.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/ScheduleWorkflowTask.java @@ -1,10 +1,11 @@ package org.keycloak.models.workflow; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; +import org.jboss.logging.Logger; + final class ScheduleWorkflowTask extends WorkflowTransactionalTask { private static final Logger log = Logger.getLogger(ScheduleWorkflowTask.class); diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/UserResourceTypeWorkflowProvider.java b/model/jpa/src/main/java/org/keycloak/models/workflow/UserResourceTypeWorkflowProvider.java index 855304fe298..2f9766a3f1f 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/UserResourceTypeWorkflowProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/UserResourceTypeWorkflowProvider.java @@ -17,8 +17,6 @@ package org.keycloak.models.workflow; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_CONDITIONS; - import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -29,6 +27,7 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; import jakarta.persistence.criteria.Subquery; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; @@ -36,6 +35,8 @@ import org.keycloak.models.jpa.entities.UserEntity; import org.keycloak.models.workflow.conditions.ExpressionWorkflowConditionProvider; import org.keycloak.utils.StringUtil; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_CONDITIONS; + public class UserResourceTypeWorkflowProvider implements ResourceTypeSelector { private final EntityManager em; diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/WorkflowStateEntity.java b/model/jpa/src/main/java/org/keycloak/models/workflow/WorkflowStateEntity.java index c70e309b08f..b47a0d73cad 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/WorkflowStateEntity.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/WorkflowStateEntity.java @@ -17,11 +17,12 @@ package org.keycloak.models.workflow; +import java.util.Objects; + import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.Id; import jakarta.persistence.Table; -import java.util.Objects; /** * Represents the state of a resource within a time-based workflow. @@ -110,4 +111,3 @@ public class WorkflowStateEntity { return Objects.hash(resourceId, workflowId); } } - diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/ExpressionWorkflowConditionProvider.java b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/ExpressionWorkflowConditionProvider.java index 65ce86cba7f..ac0f938c8e7 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/ExpressionWorkflowConditionProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/ExpressionWorkflowConditionProvider.java @@ -4,11 +4,12 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.workflow.WorkflowConditionProvider; import org.keycloak.models.workflow.WorkflowEvent; -import org.keycloak.models.workflow.conditions.expression.ConditionEvaluator; import org.keycloak.models.workflow.conditions.expression.BooleanConditionParser.EvaluatorContext; +import org.keycloak.models.workflow.conditions.expression.ConditionEvaluator; import org.keycloak.models.workflow.conditions.expression.EvaluatorUtils; import org.keycloak.models.workflow.conditions.expression.PredicateEvaluator; diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/GroupMembershipWorkflowConditionProvider.java b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/GroupMembershipWorkflowConditionProvider.java index 13dbda4cd78..33d03a3088f 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/GroupMembershipWorkflowConditionProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/GroupMembershipWorkflowConditionProvider.java @@ -5,10 +5,10 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.models.workflow.ResourceType; import org.keycloak.models.workflow.WorkflowConditionProvider; import org.keycloak.models.workflow.WorkflowEvent; import org.keycloak.models.workflow.WorkflowInvalidStateException; -import org.keycloak.models.workflow.ResourceType; import org.keycloak.utils.StringUtil; public class GroupMembershipWorkflowConditionProvider implements WorkflowConditionProvider { diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/IdentityProviderWorkflowConditionProvider.java b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/IdentityProviderWorkflowConditionProvider.java index 3720cfb6e50..bc23c26ee7f 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/IdentityProviderWorkflowConditionProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/IdentityProviderWorkflowConditionProvider.java @@ -7,15 +7,16 @@ import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; import jakarta.persistence.criteria.Subquery; + import org.keycloak.models.FederatedIdentityModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.jpa.entities.FederatedIdentityEntity; +import org.keycloak.models.workflow.ResourceType; import org.keycloak.models.workflow.WorkflowConditionProvider; import org.keycloak.models.workflow.WorkflowEvent; import org.keycloak.models.workflow.WorkflowInvalidStateException; -import org.keycloak.models.workflow.ResourceType; import org.keycloak.utils.StringUtil; public class IdentityProviderWorkflowConditionProvider implements WorkflowConditionProvider { diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/RoleWorkflowConditionProvider.java b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/RoleWorkflowConditionProvider.java index f73161b1b35..e3fa2cc1ac2 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/RoleWorkflowConditionProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/RoleWorkflowConditionProvider.java @@ -8,11 +8,11 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; +import org.keycloak.models.utils.RoleUtils; +import org.keycloak.models.workflow.ResourceType; import org.keycloak.models.workflow.WorkflowConditionProvider; import org.keycloak.models.workflow.WorkflowEvent; import org.keycloak.models.workflow.WorkflowInvalidStateException; -import org.keycloak.models.workflow.ResourceType; -import org.keycloak.models.utils.RoleUtils; import org.keycloak.utils.StringUtil; public class RoleWorkflowConditionProvider implements WorkflowConditionProvider { diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/UserAttributeWorkflowConditionProvider.java b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/UserAttributeWorkflowConditionProvider.java index 633034abb84..88026db8c47 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/UserAttributeWorkflowConditionProvider.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/UserAttributeWorkflowConditionProvider.java @@ -1,7 +1,5 @@ package org.keycloak.models.workflow.conditions; -import static org.keycloak.common.util.CollectionUtil.collectionEquals; - import java.io.StringReader; import java.util.List; import java.util.Properties; @@ -9,11 +7,13 @@ import java.util.Properties; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import org.keycloak.models.workflow.ResourceType; import org.keycloak.models.workflow.WorkflowConditionProvider; import org.keycloak.models.workflow.WorkflowEvent; -import org.keycloak.models.workflow.ResourceType; import org.keycloak.models.workflow.WorkflowInvalidStateException; +import static org.keycloak.common.util.CollectionUtil.collectionEquals; + public class UserAttributeWorkflowConditionProvider implements WorkflowConditionProvider { private final String expectedAttribute; diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/ConditionEvaluator.java b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/ConditionEvaluator.java index c4ca69d23f0..c76f153f9fa 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/ConditionEvaluator.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/ConditionEvaluator.java @@ -1,11 +1,11 @@ package org.keycloak.models.workflow.conditions.expression; -import static org.keycloak.models.workflow.Workflows.getConditionProvider; - import org.keycloak.models.KeycloakSession; import org.keycloak.models.workflow.WorkflowConditionProvider; import org.keycloak.models.workflow.WorkflowEvent; +import static org.keycloak.models.workflow.Workflows.getConditionProvider; + public class ConditionEvaluator extends BooleanConditionParserBaseVisitor { protected final KeycloakSession session; diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/ErrorListener.java b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/ErrorListener.java index 92604591978..4248ce426ca 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/ErrorListener.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/ErrorListener.java @@ -1,10 +1,11 @@ package org.keycloak.models.workflow.conditions.expression; +import java.util.ArrayList; +import java.util.List; + import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.Recognizer; -import java.util.ArrayList; -import java.util.List; public class ErrorListener extends BaseErrorListener { private boolean hasErrors = false; diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/EvaluatorUtils.java b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/EvaluatorUtils.java index 04763c34474..373f9ac01d3 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/EvaluatorUtils.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/EvaluatorUtils.java @@ -1,11 +1,12 @@ package org.keycloak.models.workflow.conditions.expression; +import java.util.stream.Collectors; + +import org.keycloak.models.workflow.WorkflowInvalidStateException; + import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; -import org.keycloak.models.workflow.WorkflowInvalidStateException; - -import java.util.stream.Collectors; public class EvaluatorUtils { diff --git a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/PredicateEvaluator.java b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/PredicateEvaluator.java index ce74d81a4a7..b56e394577b 100644 --- a/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/PredicateEvaluator.java +++ b/model/jpa/src/main/java/org/keycloak/models/workflow/conditions/expression/PredicateEvaluator.java @@ -1,14 +1,15 @@ package org.keycloak.models.workflow.conditions.expression; -import static org.keycloak.models.workflow.Workflows.getConditionProvider; - import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.workflow.WorkflowConditionProvider; +import static org.keycloak.models.workflow.Workflows.getConditionProvider; + public class PredicateEvaluator extends BooleanConditionParserBaseVisitor { private final CriteriaBuilder cb; diff --git a/model/jpa/src/main/java/org/keycloak/organization/jpa/JpaOrganizationProvider.java b/model/jpa/src/main/java/org/keycloak/organization/jpa/JpaOrganizationProvider.java index d4e4b5f9939..31a850a849f 100644 --- a/model/jpa/src/main/java/org/keycloak/organization/jpa/JpaOrganizationProvider.java +++ b/model/jpa/src/main/java/org/keycloak/organization/jpa/JpaOrganizationProvider.java @@ -17,15 +17,6 @@ package org.keycloak.organization.jpa; -import static org.keycloak.models.OrganizationModel.ORGANIZATION_DOMAIN_ATTRIBUTE; -import static org.keycloak.models.UserModel.EMAIL; -import static org.keycloak.models.UserModel.FIRST_NAME; -import static org.keycloak.models.UserModel.LAST_NAME; -import static org.keycloak.models.UserModel.USERNAME; -import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; -import static org.keycloak.organization.utils.Organizations.isReadOnlyOrganizationMember; -import static org.keycloak.utils.StreamsUtil.closing; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -45,6 +36,7 @@ import jakarta.persistence.criteria.Join; import jakarta.persistence.criteria.JoinType; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; + import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.GroupModel; import org.keycloak.models.GroupModel.Type; @@ -68,12 +60,21 @@ import org.keycloak.models.jpa.entities.UserGroupMembershipEntity; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.ReadOnlyUserModelDelegate; import org.keycloak.organization.OrganizationProvider; -import org.keycloak.representations.idm.MembershipType; import org.keycloak.organization.utils.Organizations; +import org.keycloak.representations.idm.MembershipType; import org.keycloak.storage.StorageId; import org.keycloak.utils.ReservedCharValidator; import org.keycloak.utils.StringUtil; +import static org.keycloak.models.OrganizationModel.ORGANIZATION_DOMAIN_ATTRIBUTE; +import static org.keycloak.models.UserModel.EMAIL; +import static org.keycloak.models.UserModel.FIRST_NAME; +import static org.keycloak.models.UserModel.LAST_NAME; +import static org.keycloak.models.UserModel.USERNAME; +import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; +import static org.keycloak.organization.utils.Organizations.isReadOnlyOrganizationMember; +import static org.keycloak.utils.StreamsUtil.closing; + public class JpaOrganizationProvider implements OrganizationProvider { private final EntityManager em; diff --git a/model/jpa/src/main/java/org/keycloak/organization/jpa/JpaOrganizationProviderFactory.java b/model/jpa/src/main/java/org/keycloak/organization/jpa/JpaOrganizationProviderFactory.java index cfa293531be..111d6bf0d8d 100644 --- a/model/jpa/src/main/java/org/keycloak/organization/jpa/JpaOrganizationProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/organization/jpa/JpaOrganizationProviderFactory.java @@ -20,9 +20,9 @@ package org.keycloak.organization.jpa; import org.keycloak.Config.Scope; import org.keycloak.models.GroupModel; import org.keycloak.models.GroupModel.GroupEvent; -import org.keycloak.models.ModelValidationException; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.ModelValidationException; import org.keycloak.organization.OrganizationProvider; import org.keycloak.organization.OrganizationProviderFactory; import org.keycloak.organization.utils.Organizations; diff --git a/model/jpa/src/main/java/org/keycloak/organization/jpa/OrganizationAdapter.java b/model/jpa/src/main/java/org/keycloak/organization/jpa/OrganizationAdapter.java index 7f47b014b6a..3516cbb22b0 100644 --- a/model/jpa/src/main/java/org/keycloak/organization/jpa/OrganizationAdapter.java +++ b/model/jpa/src/main/java/org/keycloak/organization/jpa/OrganizationAdapter.java @@ -17,13 +17,11 @@ package org.keycloak.organization.jpa; -import static java.util.Optional.ofNullable; - import java.util.HashSet; -import java.util.Map; import java.util.List; -import java.util.Set; +import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -44,6 +42,8 @@ import org.keycloak.organization.OrganizationProvider; import org.keycloak.utils.EmailValidationUtil; import org.keycloak.utils.StringUtil; +import static java.util.Optional.ofNullable; + public final class OrganizationAdapter implements OrganizationModel, JpaModel { private final KeycloakSession session; diff --git a/model/jpa/src/main/java/org/keycloak/storage/configuration/jpa/JpaServerConfigStorageProvider.java b/model/jpa/src/main/java/org/keycloak/storage/configuration/jpa/JpaServerConfigStorageProvider.java index 8d55973b99c..cb7e458e77e 100644 --- a/model/jpa/src/main/java/org/keycloak/storage/configuration/jpa/JpaServerConfigStorageProvider.java +++ b/model/jpa/src/main/java/org/keycloak/storage/configuration/jpa/JpaServerConfigStorageProvider.java @@ -24,6 +24,7 @@ import java.util.function.Supplier; import jakarta.persistence.EntityManager; import jakarta.persistence.LockModeType; + import org.keycloak.storage.configuration.ServerConfigStorageProvider; import org.keycloak.storage.configuration.jpa.entity.ServerConfigEntity; diff --git a/model/jpa/src/main/java/org/keycloak/storage/configuration/jpa/JpaServerConfigStorageProviderFactory.java b/model/jpa/src/main/java/org/keycloak/storage/configuration/jpa/JpaServerConfigStorageProviderFactory.java index 94435399aa5..d310f0f99c8 100644 --- a/model/jpa/src/main/java/org/keycloak/storage/configuration/jpa/JpaServerConfigStorageProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/storage/configuration/jpa/JpaServerConfigStorageProviderFactory.java @@ -20,6 +20,7 @@ package org.keycloak.storage.configuration.jpa; import java.util.Set; import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaHashUtils.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaHashUtils.java index 0e545d5b874..df39b01f6c0 100644 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaHashUtils.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaHashUtils.java @@ -17,10 +17,6 @@ package org.keycloak.storage.jpa; -import org.keycloak.crypto.HashException; -import org.keycloak.crypto.JavaAlgorithm; -import org.keycloak.models.jpa.entities.UserEntity; - import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.util.Locale; @@ -28,6 +24,10 @@ import java.util.Map; import java.util.Objects; import java.util.function.BiPredicate; +import org.keycloak.crypto.HashException; +import org.keycloak.crypto.JavaAlgorithm; +import org.keycloak.models.jpa.entities.UserEntity; + /** * Create hashes for long values stored in the database. Offers different variants for exact and lowercase search. * Keycloak uses lowercase search to approximate a case-insensitive search. diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProvider.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProvider.java index 5322e54fdcf..d22e878fe3b 100644 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProvider.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProvider.java @@ -16,7 +16,18 @@ */ package org.keycloak.storage.jpa; -import org.jboss.logging.Logger; +import java.util.Base64; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.TypedQuery; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.Time; import org.keycloak.component.ComponentModel; @@ -52,16 +63,7 @@ import org.keycloak.storage.jpa.entity.FederatedUserRequiredActionEntity; import org.keycloak.storage.jpa.entity.FederatedUserRequiredActionEntity.Key; import org.keycloak.storage.jpa.entity.FederatedUserRoleMappingEntity; -import jakarta.persistence.EntityManager; -import jakarta.persistence.TypedQuery; -import java.util.Base64; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import jakarta.persistence.LockModeType; +import org.jboss.logging.Logger; import static org.keycloak.models.jpa.PaginationUtils.paginateQuery; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProviderFactory.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProviderFactory.java index 7e057032fad..c0ca702b59b 100644 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProviderFactory.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/JpaUserFederatedStorageProviderFactory.java @@ -16,6 +16,8 @@ */ package org.keycloak.storage.jpa; +import jakarta.persistence.EntityManager; + import org.keycloak.Config; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; @@ -23,8 +25,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.storage.federated.UserFederatedStorageProvider; import org.keycloak.storage.federated.UserFederatedStorageProviderFactory; -import jakarta.persistence.EntityManager; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/KeyUtils.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/KeyUtils.java index 6db6287a2f4..38a488b73b2 100644 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/KeyUtils.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/KeyUtils.java @@ -17,9 +17,11 @@ package org.keycloak.storage.jpa; import java.util.regex.Pattern; -import org.jboss.logging.Logger; + import org.keycloak.models.light.LightweightUserAdapter; +import org.jboss.logging.Logger; + /** * * @author hmlnarik diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/BrokerLinkEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/BrokerLinkEntity.java index ca6bbf8f72c..e893f470ed9 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/BrokerLinkEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/BrokerLinkEntity.java @@ -17,7 +17,7 @@ package org.keycloak.storage.jpa.entity; -import org.keycloak.storage.jpa.KeyUtils; +import java.io.Serializable; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -26,7 +26,8 @@ import jakarta.persistence.IdClass; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; + +import org.keycloak.storage.jpa.KeyUtils; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUser.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUser.java index 776f6f93949..d644c37bcfb 100644 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUser.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUser.java @@ -16,8 +16,6 @@ */ package org.keycloak.storage.jpa.entity; -import org.keycloak.storage.jpa.KeyUtils; - import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.Column; @@ -27,6 +25,8 @@ import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; +import org.keycloak.storage.jpa.KeyUtils; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserAttributeEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserAttributeEntity.java index 3a0e7db9a75..6bfb4e2e9e3 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserAttributeEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserAttributeEntity.java @@ -25,9 +25,11 @@ import jakarta.persistence.Id; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import org.hibernate.annotations.Nationalized; + import org.keycloak.storage.jpa.JpaHashUtils; +import org.hibernate.annotations.Nationalized; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentEntity.java index d2d20182882..fcd165abee7 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserConsentEntity.java @@ -17,6 +17,9 @@ package org.keycloak.storage.jpa.entity; +import java.util.ArrayList; +import java.util.Collection; + import jakarta.persistence.Access; import jakarta.persistence.AccessType; import jakarta.persistence.CascadeType; @@ -28,8 +31,6 @@ import jakarta.persistence.NamedQuery; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import jakarta.persistence.UniqueConstraint; -import java.util.ArrayList; -import java.util.Collection; /** * @author Marek Posolda diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserGroupMembershipEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserGroupMembershipEntity.java index 132dcf9384b..62e294f8a49 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserGroupMembershipEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserGroupMembershipEntity.java @@ -17,7 +17,7 @@ package org.keycloak.storage.jpa.entity; -import org.keycloak.storage.jpa.KeyUtils; +import java.io.Serializable; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -26,7 +26,8 @@ import jakarta.persistence.IdClass; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; + +import org.keycloak.storage.jpa.KeyUtils; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRequiredActionEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRequiredActionEntity.java index 6941473c0e4..27bc2e6906f 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRequiredActionEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRequiredActionEntity.java @@ -17,7 +17,8 @@ package org.keycloak.storage.jpa.entity; -import org.keycloak.storage.jpa.KeyUtils; +import java.io.Serializable; +import java.util.Objects; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -26,8 +27,8 @@ import jakarta.persistence.IdClass; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; -import java.util.Objects; + +import org.keycloak.storage.jpa.KeyUtils; /** * @author Bill Burke diff --git a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRoleMappingEntity.java b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRoleMappingEntity.java index 240f759bd55..abc691bbee8 100755 --- a/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRoleMappingEntity.java +++ b/model/jpa/src/main/java/org/keycloak/storage/jpa/entity/FederatedUserRoleMappingEntity.java @@ -17,7 +17,7 @@ package org.keycloak.storage.jpa.entity; -import org.keycloak.storage.jpa.KeyUtils; +import java.io.Serializable; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -26,7 +26,8 @@ import jakarta.persistence.IdClass; import jakarta.persistence.NamedQueries; import jakarta.persistence.NamedQuery; import jakarta.persistence.Table; -import java.io.Serializable; + +import org.keycloak.storage.jpa.KeyUtils; /** * @author Bill Burke diff --git a/model/jpa/src/test/java/org/keycloak/storage/jpa/JpaHashUtilsTest.java b/model/jpa/src/test/java/org/keycloak/storage/jpa/JpaHashUtilsTest.java index 92731c75328..3c40b2390f3 100644 --- a/model/jpa/src/test/java/org/keycloak/storage/jpa/JpaHashUtilsTest.java +++ b/model/jpa/src/test/java/org/keycloak/storage/jpa/JpaHashUtilsTest.java @@ -17,14 +17,15 @@ package org.keycloak.storage.jpa; -import org.junit.Test; -import org.keycloak.models.jpa.entities.UserAttributeEntity; -import org.keycloak.models.jpa.entities.UserEntity; - import java.util.List; import java.util.Locale; import java.util.Map; +import org.keycloak.models.jpa.entities.UserAttributeEntity; +import org.keycloak.models.jpa.entities.UserEntity; + +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/model/jpa/src/test/java/org/keycloak/storage/jpa/KeyUtilsTest.java b/model/jpa/src/test/java/org/keycloak/storage/jpa/KeyUtilsTest.java index d0e45f96749..d1de703e1ec 100644 --- a/model/jpa/src/test/java/org/keycloak/storage/jpa/KeyUtilsTest.java +++ b/model/jpa/src/test/java/org/keycloak/storage/jpa/KeyUtilsTest.java @@ -17,9 +17,11 @@ package org.keycloak.storage.jpa; import java.util.UUID; -import org.junit.Test; + import org.keycloak.models.utils.KeycloakModelUtils; +import org.junit.Test; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/model/storage-private/src/main/java/org/keycloak/exportimport/util/ExportUtils.java b/model/storage-private/src/main/java/org/keycloak/exportimport/util/ExportUtils.java index 9f9b513e32e..d959970f085 100755 --- a/model/storage-private/src/main/java/org/keycloak/exportimport/util/ExportUtils.java +++ b/model/storage-private/src/main/java/org/keycloak/exportimport/util/ExportUtils.java @@ -17,11 +17,19 @@ package org.keycloak.exportimport.util; -import com.fasterxml.jackson.core.JsonEncoding; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; +import java.io.IOException; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; import org.keycloak.common.Version; @@ -44,6 +52,8 @@ import org.keycloak.representations.idm.ComponentExportRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.FederatedIdentityRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; +import org.keycloak.representations.idm.MemberRepresentation; +import org.keycloak.representations.idm.MembershipType; import org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RoleRepresentation; @@ -53,20 +63,11 @@ import org.keycloak.representations.idm.UserConsentRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.storage.federated.UserFederatedStorageProvider; -import java.io.IOException; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import org.keycloak.representations.idm.MemberRepresentation; -import org.keycloak.representations.idm.MembershipType; +import com.fasterxml.jackson.core.JsonEncoding; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; /** * @author Marek Posolda diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo18_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo18_0_0.java index 5790c150a89..d303ef50c35 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo18_0_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo18_0_0.java @@ -18,7 +18,6 @@ package org.keycloak.migration.migrators; -import org.jboss.logging.Logger; import org.keycloak.common.Profile; import org.keycloak.migration.MigrationProvider; import org.keycloak.migration.ModelVersion; @@ -28,6 +27,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.RealmRepresentation; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java index cb1fdd3e3c6..ea4106ea0ea 100755 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_3_0.java @@ -17,21 +17,21 @@ package org.keycloak.migration.migrators; +import java.util.List; +import javax.naming.directory.SearchControls; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentFactory; import org.keycloak.migration.ModelVersion; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; -import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.RealmModel; +import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.provider.ProviderFactory; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderModel; -import javax.naming.directory.SearchControls; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java index 51c85666cee..401e6c85e72 100755 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_4_0.java @@ -17,13 +17,19 @@ package org.keycloak.migration.migrators; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + import org.keycloak.component.ComponentModel; import org.keycloak.migration.ModelVersion; import org.keycloak.models.ImpersonationConstants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; -import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.RealmModel; +import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.cache.UserCache; import org.keycloak.models.utils.DefaultAuthenticationFlows; @@ -33,12 +39,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.UserStoragePrivateUtil; import org.keycloak.storage.UserStorageUtil; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java index 3c538d110d4..75aadbc09e9 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_7_0.java @@ -17,12 +17,12 @@ package org.keycloak.migration.migrators; -import org.keycloak.models.IdentityProviderQuery; import org.keycloak.migration.MigrationProvider; import org.keycloak.migration.ModelVersion; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.Constants; import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderQuery; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.DefaultAuthenticationFlows; diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java index 6874eefebd0..7a515d84c01 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_8_0.java @@ -17,18 +17,18 @@ package org.keycloak.migration.migrators; +import java.util.Objects; + import org.keycloak.component.ComponentModel; import org.keycloak.migration.ModelVersion; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; -import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.RealmModel; +import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.UserStorageProviderModel; -import java.util.Objects; - /** * @author Marek Posolda */ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_2.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_2.java index 97d831a558d..859eb91af1b 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_2.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo1_9_2.java @@ -17,15 +17,15 @@ package org.keycloak.migration.migrators; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.migration.ModelVersion; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - public class MigrateTo1_9_2 implements Migration { public static final ModelVersion VERSION = new ModelVersion("1.9.2"); diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo22_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo22_0_0.java index 00f5caa3a63..1df65f67948 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo22_0_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo22_0_0.java @@ -19,7 +19,6 @@ package org.keycloak.migration.migrators; -import org.jboss.logging.Logger; import org.keycloak.migration.ModelVersion; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.KeycloakSession; @@ -28,6 +27,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.RealmRepresentation; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo23_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo23_0_0.java index 847f32b884b..48221bd9f57 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo23_0_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo23_0_0.java @@ -21,7 +21,6 @@ package org.keycloak.migration.migrators; import java.util.Optional; -import org.jboss.logging.Logger; import org.keycloak.authentication.AuthenticationFlow; import org.keycloak.component.ComponentModel; import org.keycloak.migration.ModelVersion; @@ -29,6 +28,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.userprofile.UserProfileProvider; +import org.jboss.logging.Logger; + public class MigrateTo23_0_0 extends RealmMigration { private static final Logger LOG = Logger.getLogger(MigrateTo23_0_0.class); diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_0.java index 3043661b064..781be148dce 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_0.java @@ -19,7 +19,6 @@ package org.keycloak.migration.migrators; -import org.jboss.logging.Logger; import org.keycloak.migration.ModelVersion; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.KeycloakSession; @@ -32,6 +31,8 @@ import org.keycloak.representations.userprofile.config.UPConfig.UnmanagedAttribu import org.keycloak.storage.UserStorageProvider; import org.keycloak.userprofile.UserProfileProvider; +import org.jboss.logging.Logger; + public class MigrateTo24_0_0 extends RealmMigration { private static final Logger LOG = Logger.getLogger(MigrateTo24_0_0.class); diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_3.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_3.java index 82d88951419..b95a3c89436 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_3.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo24_0_3.java @@ -19,12 +19,13 @@ package org.keycloak.migration.migrators; -import org.jboss.logging.Logger; import org.keycloak.migration.ModelVersion; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.DefaultRequiredActions; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo25_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo25_0_0.java index 9deba7d15a3..c8758c32ba3 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo25_0_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo25_0_0.java @@ -20,7 +20,6 @@ package org.keycloak.migration.migrators; -import org.jboss.logging.Logger; import org.keycloak.migration.MigrationProvider; import org.keycloak.migration.ModelVersion; import org.keycloak.models.ClientScopeModel; @@ -28,6 +27,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; +import org.jboss.logging.Logger; + /** * @author Giuseppe Graziano */ @@ -70,4 +71,3 @@ public class MigrateTo25_0_0 extends RealmMigration { } } - diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo26_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo26_0_0.java index 834626de590..1d6288cdefc 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo26_0_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo26_0_0.java @@ -59,4 +59,3 @@ public class MigrateTo26_0_0 extends RealmMigration { } } } - diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_1_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_1_0.java index f5a821c1185..487b9c3697f 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_1_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_1_0.java @@ -17,6 +17,12 @@ package org.keycloak.migration.migrators; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.store.PolicyStore; @@ -29,12 +35,6 @@ import org.keycloak.models.UserModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.util.JsonSerialization; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - /** * * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_2_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_2_0.java index a9421384b77..e0c0cca3151 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_2_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo2_2_0.java @@ -17,15 +17,16 @@ package org.keycloak.migration.migrators; -import org.jboss.logging.Logger; -import org.keycloak.models.IdentityProviderQuery; import org.keycloak.migration.ModelVersion; import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderQuery; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.DefaultAuthenticationFlows; import org.keycloak.representations.idm.RealmRepresentation; +import org.jboss.logging.Logger; + public class MigrateTo2_2_0 implements Migration { public static final ModelVersion VERSION = new ModelVersion("2.2.0"); diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_0_0.java index 4a465a0dbd3..3409ef7e8f0 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_0_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_0_0.java @@ -18,6 +18,8 @@ package org.keycloak.migration.migrators; +import java.util.Objects; + import org.keycloak.migration.ModelVersion; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -25,8 +27,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.Objects; - import static org.keycloak.models.AccountRoles.MANAGE_ACCOUNT; import static org.keycloak.models.AccountRoles.MANAGE_ACCOUNT_LINKS; import static org.keycloak.models.Constants.ACCOUNT_MANAGEMENT_CLIENT_ID; diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_1_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_1_0.java index e5bf948def4..a2aeea2e39f 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_1_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_1_0.java @@ -18,15 +18,15 @@ package org.keycloak.migration.migrators; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.migration.ModelVersion; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - /** * @author Bill Burke */ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_2_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_2_0.java index ef9abc4160b..b825306bab9 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_2_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_2_0.java @@ -21,9 +21,9 @@ import org.keycloak.models.AdminRoles; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; +import org.keycloak.models.PasswordPolicy; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; -import org.keycloak.models.PasswordPolicy; import org.keycloak.models.utils.DefaultAuthenticationFlows; import org.keycloak.representations.idm.RealmRepresentation; diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_0.java index 6accd3d8895..6efb09e86cc 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_0.java @@ -17,16 +17,16 @@ package org.keycloak.migration.migrators; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.migration.ModelVersion; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.DefaultKeyProviders; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - /** * @author Marek Posolda */ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_1.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_1.java index 7afd9c32069..a62f84bd1b7 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_1.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_1.java @@ -18,16 +18,16 @@ package org.keycloak.migration.migrators; -import org.keycloak.migration.ModelVersion; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.representations.idm.RealmRepresentation; - import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import org.keycloak.migration.ModelVersion; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.representations.idm.RealmRepresentation; + /** * @author Bruno Oliveira */ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_2.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_2.java index 669505b8b86..fe1366434f4 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_2.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo3_4_2.java @@ -18,6 +18,8 @@ package org.keycloak.migration.migrators; +import java.util.stream.Collectors; + import org.keycloak.migration.ModelVersion; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; @@ -25,8 +27,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.stream.Collectors; - /** * @author Bruno Oliveira */ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_0_0.java index c94119ee4dc..abd5744cbab 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_0_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_0_0.java @@ -20,7 +20,6 @@ package org.keycloak.migration.migrators; import java.util.List; import java.util.Objects; -import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.migration.ModelVersion; import org.keycloak.models.ClientModel; @@ -32,6 +31,8 @@ import org.keycloak.models.utils.DefaultClientScopes; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.RealmRepresentation; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_2_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_2_0.java index 748ee544fc7..c443e70d341 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_2_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_2_0.java @@ -17,17 +17,18 @@ package org.keycloak.migration.migrators; -import static java.util.Comparator.comparing; - import java.util.concurrent.atomic.AtomicInteger; -import org.jboss.logging.Logger; import org.keycloak.migration.ModelVersion; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RequiredActionProviderModel; import org.keycloak.representations.idm.RealmRepresentation; +import org.jboss.logging.Logger; + +import static java.util.Comparator.comparing; + /** * @author Hiroyuki Wada */ diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_6_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_6_0.java index 0293d94378f..64b87d893c6 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_6_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo4_6_0.java @@ -17,7 +17,6 @@ package org.keycloak.migration.migrators; -import org.jboss.logging.Logger; import org.keycloak.migration.MigrationProvider; import org.keycloak.migration.ModelVersion; import org.keycloak.models.ClientScopeModel; @@ -25,6 +24,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; +import org.jboss.logging.Logger; + /** * @author Marek Posolda diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo6_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo6_0_0.java index 600345d8ae9..8a8fe1d0bb3 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo6_0_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo6_0_0.java @@ -17,7 +17,6 @@ package org.keycloak.migration.migrators; -import org.jboss.logging.Logger; import org.keycloak.migration.MigrationProvider; import org.keycloak.migration.ModelVersion; import org.keycloak.models.ClientScopeModel; @@ -25,6 +24,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; +import org.jboss.logging.Logger; + /** * Implements the migration necessary for version 6.0.0. * diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_0.java index 42aaa8f8f38..39c85da43c8 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_0.java @@ -17,7 +17,9 @@ package org.keycloak.migration.migrators; -import org.jboss.logging.Logger; +import java.util.Collections; +import java.util.stream.Collectors; + import org.keycloak.migration.ModelVersion; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; @@ -27,8 +29,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.Collections; -import java.util.stream.Collectors; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_2.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_2.java index aaee68a4c90..c93eab3e1d6 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_2.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo8_0_2.java @@ -24,7 +24,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.migration.ModelVersion; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; @@ -32,6 +31,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; +import org.jboss.logging.Logger; + import static org.keycloak.models.AuthenticationExecutionModel.Requirement.ALTERNATIVE; import static org.keycloak.models.AuthenticationExecutionModel.Requirement.CONDITIONAL; import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUIRED; diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_0.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_0.java index 4022c4dce92..e1d9918d53c 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_0.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_0.java @@ -17,7 +17,6 @@ package org.keycloak.migration.migrators; -import org.jboss.logging.Logger; import org.keycloak.migration.ModelVersion; import org.keycloak.models.AccountRoles; import org.keycloak.models.ClientModel; @@ -30,6 +29,8 @@ import org.keycloak.models.utils.DefaultRequiredActions; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.RealmRepresentation; +import org.jboss.logging.Logger; + /** * @author Marek Posolda diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_4.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_4.java index a59f98fb157..cb10975ef83 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_4.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/MigrateTo9_0_4.java @@ -18,13 +18,15 @@ package org.keycloak.migration.migrators; import java.util.UUID; -import org.jboss.logging.Logger; + import org.keycloak.migration.ModelVersion; import org.keycloak.models.AuthenticatorConfigModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; +import org.jboss.logging.Logger; + public class MigrateTo9_0_4 implements Migration { public static final ModelVersion VERSION = new ModelVersion("9.0.4"); diff --git a/model/storage-private/src/main/java/org/keycloak/migration/migrators/RealmMigration.java b/model/storage-private/src/main/java/org/keycloak/migration/migrators/RealmMigration.java index c6813e24bba..6f06833d1b5 100644 --- a/model/storage-private/src/main/java/org/keycloak/migration/migrators/RealmMigration.java +++ b/model/storage-private/src/main/java/org/keycloak/migration/migrators/RealmMigration.java @@ -19,13 +19,14 @@ package org.keycloak.migration.migrators; -import org.jboss.logging.Logger; import org.keycloak.connections.jpa.support.EntityManagers; import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; +import org.jboss.logging.Logger; + public abstract class RealmMigration implements Migration { private static final Logger LOG = Logger.getLogger(RealmMigration.class); diff --git a/model/storage-private/src/main/java/org/keycloak/models/cache/CachedRealmModel.java b/model/storage-private/src/main/java/org/keycloak/models/cache/CachedRealmModel.java index aa9d0b1f5b5..7ecedd0f976 100644 --- a/model/storage-private/src/main/java/org/keycloak/models/cache/CachedRealmModel.java +++ b/model/storage-private/src/main/java/org/keycloak/models/cache/CachedRealmModel.java @@ -16,13 +16,13 @@ */ package org.keycloak.models.cache; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.StorageProviderRealmModel; -import org.keycloak.models.RealmModel; -import org.keycloak.provider.ProviderEvent; - import java.util.concurrent.ConcurrentHashMap; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.models.StorageProviderRealmModel; +import org.keycloak.provider.ProviderEvent; + /** * Cached realms will implement this interface * diff --git a/model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockManager.java b/model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockManager.java index e6ade4a4094..e7308770dcd 100644 --- a/model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockManager.java +++ b/model/storage-private/src/main/java/org/keycloak/models/dblock/DBLockManager.java @@ -17,9 +17,10 @@ package org.keycloak.models.dblock; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/model/storage-private/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java b/model/storage-private/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java index d8f70fe27e0..e2183ebf248 100644 --- a/model/storage-private/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java +++ b/model/storage-private/src/main/java/org/keycloak/models/session/DisabledUserSessionPersisterProvider.java @@ -17,6 +17,11 @@ package org.keycloak.models.session; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.stream.Stream; + import org.keycloak.Config; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; @@ -26,11 +31,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import java.util.Collection; -import java.util.Collections; -import java.util.Map; -import java.util.stream.Stream; - /** * Persistence of userSessions is disabled . Useful just if you never need survive of userSessions/clientSessions * among server restart. Offline sessions / offline tokens will be invalid after server restart as well, diff --git a/model/storage-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java b/model/storage-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java index 01cddb838ce..71ac4fc95a8 100644 --- a/model/storage-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java +++ b/model/storage-private/src/main/java/org/keycloak/models/session/PersistentAuthenticatedClientSessionAdapter.java @@ -17,8 +17,13 @@ package org.keycloak.models.session; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -27,12 +32,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; /** * @author Marek Posolda diff --git a/model/storage-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java b/model/storage-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java index bc123908d20..371e7b75017 100644 --- a/model/storage-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java +++ b/model/storage-private/src/main/java/org/keycloak/models/session/PersistentUserSessionAdapter.java @@ -17,7 +17,13 @@ package org.keycloak.models.session; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.io.IOException; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.function.Consumer; + import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.KeycloakSession; @@ -29,12 +35,7 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.models.light.LightweightUserAdapter; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.function.Consumer; +import com.fasterxml.jackson.annotation.JsonProperty; import static org.keycloak.models.Constants.SESSION_NOTE_LIGHTWEIGHT_USER; diff --git a/model/storage-private/src/main/java/org/keycloak/models/session/RevokedTokenPersisterProvider.java b/model/storage-private/src/main/java/org/keycloak/models/session/RevokedTokenPersisterProvider.java index 12dc537f8c6..81cea5835eb 100644 --- a/model/storage-private/src/main/java/org/keycloak/models/session/RevokedTokenPersisterProvider.java +++ b/model/storage-private/src/main/java/org/keycloak/models/session/RevokedTokenPersisterProvider.java @@ -17,10 +17,10 @@ package org.keycloak.models.session; -import org.keycloak.provider.Provider; - import java.util.stream.Stream; +import org.keycloak.provider.Provider; + /** * Use this to revoke a token, so they will be available even after the restart of Keycloak. * The store can be optimized in a way that entries are only added and are only removed by expiry. diff --git a/model/storage-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java b/model/storage-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java index 4f6eab1c9d7..2ab34bea9a8 100644 --- a/model/storage-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java +++ b/model/storage-private/src/main/java/org/keycloak/models/session/UserSessionPersisterProvider.java @@ -17,6 +17,10 @@ package org.keycloak.models.session; +import java.util.Collection; +import java.util.Map; +import java.util.stream.Stream; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; @@ -24,10 +28,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.provider.Provider; -import java.util.Collection; -import java.util.Map; -import java.util.stream.Stream; - /** * @author Marek Posolda */ diff --git a/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredAdminEvents.java b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredAdminEvents.java index 65b2fa76209..726c283adc2 100755 --- a/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredAdminEvents.java +++ b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredAdminEvents.java @@ -17,12 +17,13 @@ package org.keycloak.services.scheduled; -import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; import org.keycloak.storage.datastore.PeriodicEventInvalidation; import org.keycloak.timer.ScheduledTask; +import org.jboss.logging.Logger; + public class ClearExpiredAdminEvents implements ScheduledTask { protected static final Logger logger = Logger.getLogger(ClearExpiredAdminEvents.class); diff --git a/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredEvents.java b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredEvents.java index 16d70c089d5..6493cb1722f 100755 --- a/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredEvents.java +++ b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredEvents.java @@ -17,12 +17,13 @@ package org.keycloak.services.scheduled; -import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.events.EventStoreProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.timer.ScheduledTask; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredRevokedTokens.java b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredRevokedTokens.java index 64d3615ea8e..469f479a59d 100755 --- a/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredRevokedTokens.java +++ b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredRevokedTokens.java @@ -17,12 +17,13 @@ package org.keycloak.services.scheduled; -import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; import org.keycloak.models.session.RevokedTokenPersisterProvider; import org.keycloak.timer.ScheduledTask; +import org.jboss.logging.Logger; + /** * Clear all expired revoked tokens. */ diff --git a/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java index c7fa73dbee1..68bb4090fda 100755 --- a/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java +++ b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClearExpiredUserSessions.java @@ -17,11 +17,12 @@ package org.keycloak.services.scheduled; -import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; import org.keycloak.timer.ScheduledTask; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClusterAwareScheduledTaskRunner.java b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClusterAwareScheduledTaskRunner.java index beef6d052ad..1b5474f4596 100644 --- a/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClusterAwareScheduledTaskRunner.java +++ b/model/storage-private/src/main/java/org/keycloak/services/scheduled/ClusterAwareScheduledTaskRunner.java @@ -17,14 +17,15 @@ package org.keycloak.services.scheduled; -import org.jboss.logging.Logger; +import java.util.concurrent.Callable; + import org.keycloak.cluster.ClusterProvider; import org.keycloak.cluster.ExecutionResult; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.timer.ScheduledTask; -import java.util.concurrent.Callable; +import org.jboss.logging.Logger; /** * Ensures that there are not concurrent executions of same task (either on this host or any other cluster host) diff --git a/model/storage-private/src/main/java/org/keycloak/storage/ClientScopeStorageManager.java b/model/storage-private/src/main/java/org/keycloak/storage/ClientScopeStorageManager.java index 2e72b6a8cc1..04d4b93ffc3 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/ClientScopeStorageManager.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/ClientScopeStorageManager.java @@ -18,6 +18,7 @@ package org.keycloak.storage; import java.util.Map; import java.util.stream.Stream; + import org.keycloak.models.ClientScopeModel; import org.keycloak.models.ClientScopeProvider; import org.keycloak.models.KeycloakSession; diff --git a/model/storage-private/src/main/java/org/keycloak/storage/ClientStorageManager.java b/model/storage-private/src/main/java/org/keycloak/storage/ClientStorageManager.java index f822eadbc07..763092ea782 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/ClientStorageManager.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/ClientStorageManager.java @@ -17,26 +17,27 @@ package org.keycloak.storage; import java.util.Map; -import org.jboss.logging.Logger; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Stream; + import org.keycloak.common.util.reflections.Types; import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientProvider; +import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.ModelException; import org.keycloak.models.RealmModel; +import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.storage.client.ClientLookupProvider; import org.keycloak.storage.client.ClientStorageProvider; import org.keycloak.storage.client.ClientStorageProviderFactory; import org.keycloak.storage.client.ClientStorageProviderModel; import org.keycloak.utils.ServicesUtils; -import java.util.Objects; -import java.util.function.Function; -import java.util.Set; -import java.util.stream.Stream; -import org.keycloak.models.ClientScopeModel; +import org.jboss.logging.Logger; import static org.keycloak.utils.StreamsUtil.paginatedStream; diff --git a/model/storage-private/src/main/java/org/keycloak/storage/GroupStorageManager.java b/model/storage-private/src/main/java/org/keycloak/storage/GroupStorageManager.java index 4246495b649..271c6fad755 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/GroupStorageManager.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/GroupStorageManager.java @@ -18,6 +18,7 @@ package org.keycloak.storage; import java.util.Map; import java.util.stream.Stream; + import org.keycloak.models.GroupModel; import org.keycloak.models.GroupModel.Type; import org.keycloak.models.GroupProvider; diff --git a/model/storage-private/src/main/java/org/keycloak/storage/RoleStorageManager.java b/model/storage-private/src/main/java/org/keycloak/storage/RoleStorageManager.java index a3f453a1b44..612189effb8 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/RoleStorageManager.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/RoleStorageManager.java @@ -18,22 +18,24 @@ package org.keycloak.storage; import java.util.Objects; import java.util.stream.Stream; -import org.jboss.logging.Logger; + import org.keycloak.common.util.reflections.Types; import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.ModelException; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.RoleProvider; +import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.storage.role.RoleLookupProvider; import org.keycloak.storage.role.RoleStorageProvider; import org.keycloak.storage.role.RoleStorageProviderFactory; import org.keycloak.storage.role.RoleStorageProviderModel; import org.keycloak.utils.ServicesUtils; +import org.jboss.logging.Logger; + public class RoleStorageManager implements RoleProvider { private static final Logger logger = Logger.getLogger(RoleStorageManager.class); diff --git a/model/storage-private/src/main/java/org/keycloak/storage/UserStorageManager.java b/model/storage-private/src/main/java/org/keycloak/storage/UserStorageManager.java index df1e97a378f..fdb7e996542 100755 --- a/model/storage-private/src/main/java/org/keycloak/storage/UserStorageManager.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/UserStorageManager.java @@ -17,11 +17,6 @@ package org.keycloak.storage; -import static org.keycloak.models.utils.KeycloakModelUtils.runJobInTransaction; -import static org.keycloak.storage.managers.UserStorageSyncManager.notifyToRefreshPeriodicSync; -import static org.keycloak.utils.StreamsUtil.distinctByKey; -import static org.keycloak.utils.StreamsUtil.paginatedStream; - import java.util.Collections; import java.util.List; import java.util.Map; @@ -35,8 +30,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import io.opentelemetry.api.trace.StatusCode; -import org.jboss.logging.Logger; import org.keycloak.common.Profile; import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.common.util.reflections.Types; @@ -86,6 +79,14 @@ import org.keycloak.userprofile.UserProfileMetadata; import org.keycloak.utils.StreamsUtil; import org.keycloak.utils.StringUtil; +import io.opentelemetry.api.trace.StatusCode; +import org.jboss.logging.Logger; + +import static org.keycloak.models.utils.KeycloakModelUtils.runJobInTransaction; +import static org.keycloak.storage.managers.UserStorageSyncManager.notifyToRefreshPeriodicSync; +import static org.keycloak.utils.StreamsUtil.distinctByKey; +import static org.keycloak.utils.StreamsUtil.paginatedStream; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage-private/src/main/java/org/keycloak/storage/client/AbstractClientStorageAdapter.java b/model/storage-private/src/main/java/org/keycloak/storage/client/AbstractClientStorageAdapter.java index 4cced449c95..f17dacc2a08 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/client/AbstractClientStorageAdapter.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/client/AbstractClientStorageAdapter.java @@ -16,14 +16,14 @@ */ package org.keycloak.storage.client; +import java.util.Collections; +import java.util.Map; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.storage.StorageId; -import java.util.Collections; -import java.util.Map; - /** * Helper base class for ClientModel implementations for ClientStorageProvider implementations. * diff --git a/model/storage-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientStorageAdapter.java b/model/storage-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientStorageAdapter.java index 2dea5d8dfbf..c1a647b6b24 100755 --- a/model/storage-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientStorageAdapter.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/client/AbstractReadOnlyClientStorageAdapter.java @@ -16,6 +16,8 @@ */ package org.keycloak.storage.client; +import java.util.Set; + import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; @@ -23,8 +25,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.storage.ReadOnlyException; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderFactory.java index e9f8ee7caab..fc6560b9240 100755 --- a/model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderFactory.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderFactory.java @@ -17,6 +17,11 @@ package org.keycloak.storage.client; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.component.ComponentFactory; import org.keycloak.component.ComponentModel; @@ -26,11 +31,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderSpi.java b/model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderSpi.java index bf1146d40ed..49eba040ca8 100755 --- a/model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderSpi.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/client/ClientStorageProviderSpi.java @@ -17,15 +17,15 @@ package org.keycloak.storage.client; +import java.util.Collections; +import java.util.List; + import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; -import java.util.Collections; -import java.util.List; - /** * @author Stian Thorgersen */ diff --git a/model/storage-private/src/main/java/org/keycloak/storage/client/UnsupportedOperationsClientStorageAdapter.java b/model/storage-private/src/main/java/org/keycloak/storage/client/UnsupportedOperationsClientStorageAdapter.java index b20e9c243f4..5ff38ecd507 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/client/UnsupportedOperationsClientStorageAdapter.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/client/UnsupportedOperationsClientStorageAdapter.java @@ -16,12 +16,12 @@ */ package org.keycloak.storage.client; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.ModelException; import org.keycloak.models.RoleModel; -import java.util.stream.Stream; - /** * Base helper class. Unsupported operations are implemented here that throw exception on invocation. * diff --git a/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java index e4381e4e480..c7d9d9bf07a 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderFactory.java @@ -21,6 +21,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.keycloak.Config; import org.keycloak.component.ComponentFactory; import org.keycloak.component.ComponentModel; diff --git a/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java b/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java index 5752f578fd5..3ed74d3aa1f 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/clientscope/ClientScopeStorageProviderSpi.java @@ -19,6 +19,7 @@ package org.keycloak.storage.clientscope; import java.util.Collections; import java.util.List; + import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; diff --git a/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProvider.java b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProvider.java index 0ed2347fa46..045a379ad27 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProvider.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProvider.java @@ -36,9 +36,9 @@ import org.keycloak.storage.ClientStorageManager; import org.keycloak.storage.DatastoreProvider; import org.keycloak.storage.ExportImportManager; import org.keycloak.storage.GroupStorageManager; -import org.keycloak.storage.StoreManagers; import org.keycloak.storage.MigrationManager; import org.keycloak.storage.RoleStorageManager; +import org.keycloak.storage.StoreManagers; import org.keycloak.storage.UserStorageManager; import org.keycloak.storage.federated.UserFederatedStorageProvider; diff --git a/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProviderFactory.java index 39a521525f6..952e850f929 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProviderFactory.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultDatastoreProviderFactory.java @@ -20,7 +20,6 @@ package org.keycloak.storage.datastore; import java.util.Arrays; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.Config.Scope; import org.keycloak.migration.MigrationModelManager; @@ -45,6 +44,8 @@ import org.keycloak.storage.managers.UserStorageSyncManager; import org.keycloak.timer.ScheduledTask; import org.keycloak.timer.TimerProvider; +import org.jboss.logging.Logger; + public class DefaultDatastoreProviderFactory implements DatastoreProviderFactory, ProviderEventListener { private static final String PROVIDER_ID = "legacy"; diff --git a/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultExportImportManager.java b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultExportImportManager.java index 9e4ff35bfda..3603c2a0cfc 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultExportImportManager.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultExportImportManager.java @@ -17,7 +17,24 @@ package org.keycloak.storage.datastore; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.MediaType; + import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; import org.keycloak.common.enums.SslRequired; @@ -115,22 +132,7 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; import org.keycloak.validation.ValidationUtil; -import jakarta.ws.rs.core.MediaType; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.stream.Collectors; +import org.jboss.logging.Logger; import static org.keycloak.models.utils.DefaultRequiredActions.getDefaultRequiredActionCaseInsensitively; import static org.keycloak.models.utils.ModelToRepresentation.stripRealmAttributesIncludedAsFields; diff --git a/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultMigrationManager.java b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultMigrationManager.java index 8e482a367a6..5b806e3820f 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultMigrationManager.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/datastore/DefaultMigrationManager.java @@ -17,14 +17,16 @@ package org.keycloak.storage.datastore; -import org.jboss.logging.Logger; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.regex.Pattern; + import org.keycloak.common.Version; import org.keycloak.migration.MigrationModel; import org.keycloak.migration.ModelVersion; import org.keycloak.migration.migrators.MigrateTo12_0_0; import org.keycloak.migration.migrators.MigrateTo14_0_0; import org.keycloak.migration.migrators.MigrateTo18_0_0; -import org.keycloak.migration.migrators.MigrateTo20_0_0; import org.keycloak.migration.migrators.MigrateTo1_2_0; import org.keycloak.migration.migrators.MigrateTo1_3_0; import org.keycloak.migration.migrators.MigrateTo1_4_0; @@ -34,6 +36,7 @@ import org.keycloak.migration.migrators.MigrateTo1_7_0; import org.keycloak.migration.migrators.MigrateTo1_8_0; import org.keycloak.migration.migrators.MigrateTo1_9_0; import org.keycloak.migration.migrators.MigrateTo1_9_2; +import org.keycloak.migration.migrators.MigrateTo20_0_0; import org.keycloak.migration.migrators.MigrateTo21_0_0; import org.keycloak.migration.migrators.MigrateTo22_0_0; import org.keycloak.migration.migrators.MigrateTo23_0_0; @@ -74,9 +77,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.MigrationManager; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.regex.Pattern; +import org.jboss.logging.Logger; /** * This wraps the functionality for migrations of the storage. diff --git a/model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java b/model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java index 148381501d4..53e96463e18 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderFactory.java @@ -17,6 +17,11 @@ package org.keycloak.storage.group; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.component.ComponentFactory; import org.keycloak.component.ComponentModel; @@ -26,11 +31,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public interface GroupStorageProviderFactory extends ComponentFactory { diff --git a/model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java b/model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java index 358b2d6bb7e..4cffff39e69 100644 --- a/model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/group/GroupStorageProviderSpi.java @@ -17,15 +17,15 @@ package org.keycloak.storage.group; +import java.util.Collections; +import java.util.List; + import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; -import java.util.Collections; -import java.util.List; - public class GroupStorageProviderSpi implements Spi { @Override diff --git a/model/storage-private/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java b/model/storage-private/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java index 880ee65699c..6f6d8f6e8d0 100755 --- a/model/storage-private/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java +++ b/model/storage-private/src/main/java/org/keycloak/storage/managers/UserStorageSyncManager.java @@ -16,9 +16,9 @@ */ package org.keycloak.storage.managers; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.jboss.logging.Logger; +import java.util.Objects; +import java.util.stream.Stream; + import org.keycloak.cluster.ClusterEvent; import org.keycloak.cluster.ClusterListener; import org.keycloak.cluster.ClusterProvider; @@ -41,8 +41,9 @@ import org.keycloak.storage.user.SynchronizationResult; import org.keycloak.timer.TimerProvider; import org.keycloak.timer.TimerProvider.TimerTaskContext; -import java.util.Objects; -import java.util.stream.Stream; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/model/storage-private/src/test/java/org/keycloak/models/datastore/MigrationManagerTest.java b/model/storage-private/src/test/java/org/keycloak/models/datastore/MigrationManagerTest.java index f23993176c0..57c51e279fb 100755 --- a/model/storage-private/src/test/java/org/keycloak/models/datastore/MigrationManagerTest.java +++ b/model/storage-private/src/test/java/org/keycloak/models/datastore/MigrationManagerTest.java @@ -17,19 +17,21 @@ package org.keycloak.models.datastore; -import org.junit.Test; import org.keycloak.migration.ModelVersion; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + import static org.keycloak.storage.datastore.DefaultMigrationManager.RHSSO_VERSION_7_0_KEYCLOAK_VERSION; import static org.keycloak.storage.datastore.DefaultMigrationManager.RHSSO_VERSION_7_1_KEYCLOAK_VERSION; import static org.keycloak.storage.datastore.DefaultMigrationManager.RHSSO_VERSION_7_2_KEYCLOAK_VERSION; import static org.keycloak.storage.datastore.DefaultMigrationManager.RHSSO_VERSION_7_3_KEYCLOAK_VERSION; import static org.keycloak.storage.datastore.DefaultMigrationManager.RHSSO_VERSION_7_4_KEYCLOAK_VERSION; import static org.keycloak.storage.datastore.DefaultMigrationManager.convertRHSSOVersionToKeycloakVersion; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; /** * @author Bill Burke diff --git a/model/storage-services/src/main/java/org/keycloak/exportimport/AbstractFileBasedImportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/AbstractFileBasedImportProvider.java index cd87589c1dd..6bdedbc01ab 100644 --- a/model/storage-services/src/main/java/org/keycloak/exportimport/AbstractFileBasedImportProvider.java +++ b/model/storage-services/src/main/java/org/keycloak/exportimport/AbstractFileBasedImportProvider.java @@ -17,16 +17,17 @@ package org.keycloak.exportimport; -import static org.keycloak.common.util.StringPropertyReplacer.replaceProperties; - import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Optional; + import org.keycloak.common.util.StringPropertyReplacer; +import static org.keycloak.common.util.StringPropertyReplacer.replaceProperties; + public abstract class AbstractFileBasedImportProvider implements ImportProvider { private static final StringPropertyReplacer.PropertyResolver ENV_VAR_PROPERTY_RESOLVER = new StringPropertyReplacer.PropertyResolver() { diff --git a/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java index bdc8fc58c2d..969f88cc97c 100755 --- a/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java +++ b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java @@ -17,6 +17,11 @@ package org.keycloak.exportimport.dir; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.List; + import org.keycloak.exportimport.util.ExportUtils; import org.keycloak.exportimport.util.MultipleStepsExportProvider; import org.keycloak.models.KeycloakSession; @@ -27,11 +32,6 @@ import org.keycloak.platform.Platform; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.List; - /** * @author Marek Posolda */ diff --git a/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java index 43be10a96b5..3ee8402a350 100755 --- a/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java +++ b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java @@ -17,6 +17,8 @@ package org.keycloak.exportimport.dir; +import java.util.List; + import org.keycloak.Config; import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.ExportProvider; @@ -27,8 +29,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; - import static org.keycloak.exportimport.ExportImportConfig.DEFAULT_USERS_EXPORT_STRATEGY; import static org.keycloak.exportimport.ExportImportConfig.DEFAULT_USERS_PER_FILE; diff --git a/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java index 1bf8cc70d30..9b6ff390e7d 100755 --- a/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java +++ b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java @@ -17,22 +17,6 @@ package org.keycloak.exportimport.dir; -import org.jboss.logging.Logger; -import org.keycloak.Config; -import org.keycloak.connections.jpa.support.EntityManagers; -import org.keycloak.exportimport.AbstractFileBasedImportProvider; -import org.keycloak.exportimport.Strategy; -import org.keycloak.exportimport.util.ExportImportSessionTask; -import org.keycloak.exportimport.util.ImportUtils; -import org.keycloak.exportimport.util.ExportImportSessionTask.Mode; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.platform.Platform; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.services.ServicesLogger; -import org.keycloak.util.JsonSerialization; -import org.keycloak.utils.KeycloakSessionUtil; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -41,7 +25,23 @@ import java.util.List; import java.util.Objects; import java.util.Optional; +import org.keycloak.Config; +import org.keycloak.connections.jpa.support.EntityManagers; +import org.keycloak.exportimport.AbstractFileBasedImportProvider; +import org.keycloak.exportimport.Strategy; +import org.keycloak.exportimport.util.ExportImportSessionTask; +import org.keycloak.exportimport.util.ExportImportSessionTask.Mode; +import org.keycloak.exportimport.util.ImportUtils; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.platform.Platform; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.services.ServicesLogger; import org.keycloak.storage.datastore.DefaultExportImportManager; +import org.keycloak.util.JsonSerialization; +import org.keycloak.utils.KeycloakSessionUtil; + +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java index 2325046eb62..1ab956faae2 100755 --- a/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java +++ b/model/storage-services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java @@ -17,6 +17,9 @@ package org.keycloak.exportimport.dir; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.ImportProvider; @@ -27,9 +30,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; -import java.util.Map; - import static org.keycloak.exportimport.ExportImportConfig.DEFAULT_STRATEGY; /** diff --git a/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java index aaa70bbf30e..0164df2a0e6 100755 --- a/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java +++ b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java @@ -17,10 +17,12 @@ package org.keycloak.exportimport.singlefile; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Objects; +import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.exportimport.ExportProvider; import org.keycloak.exportimport.util.ExportImportSessionTask; import org.keycloak.exportimport.util.ExportUtils; @@ -31,11 +33,9 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.ServicesLogger; import org.keycloak.services.util.ObjectMapperResolver; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.Objects; -import java.util.stream.Stream; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java index e6af0d3dbc2..83855633aed 100755 --- a/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java +++ b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java @@ -17,6 +17,10 @@ package org.keycloak.exportimport.singlefile; +import java.io.File; +import java.util.List; +import java.util.Objects; + import org.keycloak.Config; import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.ExportProvider; @@ -26,10 +30,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.io.File; -import java.util.List; -import java.util.Objects; - /** * Construct a {@link SingleFileExportProvider} to be used to export one or more realms. * For the sake of testing in the legacy testing setup, configurations can be overwritten via system properties. diff --git a/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java index 71d335dd3b7..bdee1725349 100755 --- a/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java +++ b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java @@ -17,7 +17,11 @@ package org.keycloak.exportimport.singlefile; -import org.jboss.logging.Logger; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.exportimport.AbstractFileBasedImportProvider; import org.keycloak.exportimport.Strategy; @@ -28,10 +32,7 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java index 792cb8a92fe..1c70acc6249 100755 --- a/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java +++ b/model/storage-services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java @@ -17,6 +17,10 @@ package org.keycloak.exportimport.singlefile; +import java.io.File; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.ImportProvider; @@ -27,10 +31,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.io.File; -import java.util.List; -import java.util.Map; - import static org.keycloak.exportimport.ExportImportConfig.DEFAULT_STRATEGY; /** diff --git a/model/storage-services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java b/model/storage-services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java index 0d1dcc49e66..9e8babb5d56 100755 --- a/model/storage-services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java +++ b/model/storage-services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java @@ -17,11 +17,13 @@ package org.keycloak.exportimport.util; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.io.InputStream; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.function.Consumer; + import org.keycloak.Config; import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.Strategy; @@ -34,12 +36,11 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.managers.RealmManager; import org.keycloak.storage.datastore.DefaultExportImportManager; -import java.io.IOException; -import java.io.InputStream; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Consumer; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/model/storage-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java b/model/storage-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java index 2a3196ff069..12f54642ca6 100755 --- a/model/storage-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java +++ b/model/storage-services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java @@ -17,7 +17,14 @@ package org.keycloak.exportimport.util; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.connections.jpa.support.EntityManagers; import org.keycloak.exportimport.ExportProvider; import org.keycloak.exportimport.UsersExportStrategy; @@ -31,13 +38,7 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.storage.UserStoragePrivateUtil; import org.keycloak.storage.UserStorageUtil; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheResource.java index 3757d54876e..b5a30771eb6 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheResource.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearCrlCacheResource.java @@ -17,14 +17,14 @@ package org.keycloak.services.resources.admin; +import jakarta.ws.rs.POST; + import org.keycloak.events.admin.OperationType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.cache.CacheCrlProvider; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.POST; - public class ClearCrlCacheResource { protected final AdminPermissionEvaluator auth; diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java index 2b20be21144..0a4ed0ff9a4 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearKeysCacheResource.java @@ -17,14 +17,14 @@ package org.keycloak.services.resources.admin; +import jakarta.ws.rs.POST; + import org.keycloak.events.admin.OperationType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.cache.CachePublicKeyProvider; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.POST; - public class ClearKeysCacheResource { protected final AdminPermissionEvaluator auth; diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java index 8538bc7dc5e..54d560cfce2 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearRealmCacheResource.java @@ -16,14 +16,14 @@ */ package org.keycloak.services.resources.admin; +import jakarta.ws.rs.POST; + import org.keycloak.events.admin.OperationType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.cache.CacheRealmProvider; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.POST; - /** * Clear user cache. */ diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java index 2dff198231b..6d9aa64863e 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/ClearUserCacheResource.java @@ -16,14 +16,14 @@ */ package org.keycloak.services.resources.admin; +import jakarta.ws.rs.POST; + import org.keycloak.events.admin.OperationType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.cache.UserCache; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.POST; - /** * Clear user cache. */ diff --git a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java index 5418ee8e211..394e6253fe0 100644 --- a/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java +++ b/model/storage-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java @@ -16,27 +16,12 @@ */ package org.keycloak.services.resources.admin; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; -import jakarta.ws.rs.NotFoundException; -import org.keycloak.common.ClientConnection; -import org.keycloak.component.ComponentModel; -import org.keycloak.events.admin.OperationType; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.services.ServicesLogger; -import org.keycloak.storage.managers.UserStorageSyncManager; -import org.keycloak.services.ErrorResponse; -import org.keycloak.services.managers.LDAPServerCapabilitiesManager; -import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import org.keycloak.storage.UserStorageProvider; -import org.keycloak.storage.UserStorageProviderModel; -import org.keycloak.storage.ldap.LDAPStorageProvider; -import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; -import org.keycloak.storage.user.SynchronizationResult; +import java.util.HashMap; +import java.util.Map; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; @@ -45,8 +30,25 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.HashMap; -import java.util.Map; + +import org.keycloak.common.ClientConnection; +import org.keycloak.component.ComponentModel; +import org.keycloak.events.admin.OperationType; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.services.ErrorResponse; +import org.keycloak.services.ServicesLogger; +import org.keycloak.services.managers.LDAPServerCapabilitiesManager; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.storage.UserStorageProvider; +import org.keycloak.storage.UserStorageProviderModel; +import org.keycloak.storage.ldap.LDAPStorageProvider; +import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; +import org.keycloak.storage.managers.UserStorageSyncManager; +import org.keycloak.storage.user.SynchronizationResult; + +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; /** * @resource User Storage Provider diff --git a/model/storage/src/main/java/org/keycloak/credential/UserCredentialManager.java b/model/storage/src/main/java/org/keycloak/credential/UserCredentialManager.java index aad1af29802..43a04fede78 100644 --- a/model/storage/src/main/java/org/keycloak/credential/UserCredentialManager.java +++ b/model/storage/src/main/java/org/keycloak/credential/UserCredentialManager.java @@ -17,24 +17,25 @@ package org.keycloak.credential; -import io.opentelemetry.api.trace.StatusCode; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Stream; + import org.keycloak.common.util.reflections.Types; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.storage.AbstractStorageManager; import org.keycloak.storage.DatastoreProvider; -import org.keycloak.storage.StoreManagers; import org.keycloak.storage.StorageId; +import org.keycloak.storage.StoreManagers; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderFactory; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.tracing.TracingProvider; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.stream.Stream; +import io.opentelemetry.api.trace.StatusCode; /** * Handling credentials for a given user for the store. @@ -307,4 +308,3 @@ public class UserCredentialManager extends AbstractStorageManagerBill Burke * @version $Revision: 1 $ diff --git a/model/storage/src/main/java/org/keycloak/storage/UserStorageProvider.java b/model/storage/src/main/java/org/keycloak/storage/UserStorageProvider.java index 8b149a0ecca..b342b755424 100644 --- a/model/storage/src/main/java/org/keycloak/storage/UserStorageProvider.java +++ b/model/storage/src/main/java/org/keycloak/storage/UserStorageProvider.java @@ -93,4 +93,3 @@ public interface UserStorageProvider extends Provider { UNSYNCED } } - diff --git a/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderFactory.java b/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderFactory.java index 1815c5a4dc0..3cc9df8df1c 100755 --- a/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderFactory.java +++ b/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderFactory.java @@ -17,6 +17,11 @@ package org.keycloak.storage; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.component.ComponentFactory; import org.keycloak.component.ComponentModel; @@ -27,11 +32,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.storage.user.ImportSynchronization; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderModel.java b/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderModel.java index a6dcd844e22..c0f3875affb 100755 --- a/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderModel.java +++ b/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderModel.java @@ -17,9 +17,10 @@ package org.keycloak.storage; -import org.infinispan.protostream.annotations.ProtoTypeId; import org.keycloak.component.ComponentModel; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * Stored configuration of a User Storage provider instance. * diff --git a/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderSpi.java b/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderSpi.java index e510e2c9612..f8ac400b76b 100755 --- a/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderSpi.java +++ b/model/storage/src/main/java/org/keycloak/storage/UserStorageProviderSpi.java @@ -17,15 +17,15 @@ package org.keycloak.storage; +import java.util.Collections; +import java.util.List; + import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; -import java.util.Collections; -import java.util.List; - /** * @author Stian Thorgersen */ diff --git a/model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapter.java b/model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapter.java index 1c95cf3326e..9544e9da381 100644 --- a/model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapter.java +++ b/model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapter.java @@ -16,6 +16,14 @@ */ package org.keycloak.storage.adapter; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; @@ -29,14 +37,6 @@ import org.keycloak.models.utils.RoleUtils; import org.keycloak.storage.ReadOnlyException; import org.keycloak.storage.StorageId; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * This abstract class provides implementations for everything but getUsername(). getId() returns a default value * of "f:" + providerId + ":" + getUsername(). isEnabled() returns true. getRoleMappings() will return default roles. diff --git a/model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java index 955dcffda9b..58cfc505264 100644 --- a/model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java +++ b/model/storage/src/main/java/org/keycloak/storage/adapter/AbstractUserAdapterFederatedStorage.java @@ -16,6 +16,13 @@ */ package org.keycloak.storage.adapter; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; @@ -31,13 +38,6 @@ import org.keycloak.storage.StorageId; import org.keycloak.storage.UserStorageUtil; import org.keycloak.storage.federated.UserFederatedStorageProvider; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * Assumes everything is managed by federated storage except for username. getId() returns a default value * of "f:" + providerId + ":" + getUsername(). UserModel properties like enabled, firstName, lastName, email, etc. are all diff --git a/model/storage/src/main/java/org/keycloak/storage/client/ClientStorageProvider.java b/model/storage/src/main/java/org/keycloak/storage/client/ClientStorageProvider.java index b7f45c65e7a..d97c044b588 100644 --- a/model/storage/src/main/java/org/keycloak/storage/client/ClientStorageProvider.java +++ b/model/storage/src/main/java/org/keycloak/storage/client/ClientStorageProvider.java @@ -68,4 +68,3 @@ public interface ClientStorageProvider extends Provider, ClientLookupProvider { } } - diff --git a/model/storage/src/main/java/org/keycloak/storage/federated/UserAttributeFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserAttributeFederatedStorage.java index 17cf129255b..427b8ebc9a1 100644 --- a/model/storage/src/main/java/org/keycloak/storage/federated/UserAttributeFederatedStorage.java +++ b/model/storage/src/main/java/org/keycloak/storage/federated/UserAttributeFederatedStorage.java @@ -16,12 +16,12 @@ */ package org.keycloak.storage.federated; -import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.models.RealmModel; - import java.util.List; import java.util.stream.Stream; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.models.RealmModel; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage/src/main/java/org/keycloak/storage/federated/UserBrokerLinkFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserBrokerLinkFederatedStorage.java index 5ddc9cfdd5b..196b9b78a15 100644 --- a/model/storage/src/main/java/org/keycloak/storage/federated/UserBrokerLinkFederatedStorage.java +++ b/model/storage/src/main/java/org/keycloak/storage/federated/UserBrokerLinkFederatedStorage.java @@ -16,12 +16,12 @@ */ package org.keycloak.storage.federated; +import java.util.stream.Stream; + import org.keycloak.models.FederatedIdentityModel; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.RealmModel; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage/src/main/java/org/keycloak/storage/federated/UserConsentFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserConsentFederatedStorage.java index 768b3543134..c5e846cbe2c 100644 --- a/model/storage/src/main/java/org/keycloak/storage/federated/UserConsentFederatedStorage.java +++ b/model/storage/src/main/java/org/keycloak/storage/federated/UserConsentFederatedStorage.java @@ -16,11 +16,11 @@ */ package org.keycloak.storage.federated; +import java.util.stream.Stream; + import org.keycloak.models.RealmModel; import org.keycloak.models.UserConsentModel; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProvider.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProvider.java index 345ab7d0be0..5e2ed5b1bd8 100755 --- a/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProvider.java +++ b/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedStorageProvider.java @@ -17,6 +17,8 @@ package org.keycloak.storage.federated; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; @@ -27,8 +29,6 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.provider.Provider; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedUserCredentialStore.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedUserCredentialStore.java index 15f43c86797..a8f87f85e0a 100644 --- a/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedUserCredentialStore.java +++ b/model/storage/src/main/java/org/keycloak/storage/federated/UserFederatedUserCredentialStore.java @@ -16,12 +16,12 @@ */ package org.keycloak.storage.federated; +import java.util.stream.Stream; + import org.keycloak.credential.CredentialModel; import org.keycloak.models.RealmModel; import org.keycloak.provider.Provider; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage/src/main/java/org/keycloak/storage/federated/UserGroupMembershipFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserGroupMembershipFederatedStorage.java index 22b0ea5056d..37e6bf21bd5 100644 --- a/model/storage/src/main/java/org/keycloak/storage/federated/UserGroupMembershipFederatedStorage.java +++ b/model/storage/src/main/java/org/keycloak/storage/federated/UserGroupMembershipFederatedStorage.java @@ -16,11 +16,11 @@ */ package org.keycloak.storage.federated; +import java.util.stream.Stream; + import org.keycloak.models.GroupModel; import org.keycloak.models.RealmModel; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage/src/main/java/org/keycloak/storage/federated/UserRequiredActionsFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserRequiredActionsFederatedStorage.java index bea45f34915..e418006d606 100644 --- a/model/storage/src/main/java/org/keycloak/storage/federated/UserRequiredActionsFederatedStorage.java +++ b/model/storage/src/main/java/org/keycloak/storage/federated/UserRequiredActionsFederatedStorage.java @@ -16,10 +16,10 @@ */ package org.keycloak.storage.federated; -import org.keycloak.models.RealmModel; - import java.util.stream.Stream; +import org.keycloak.models.RealmModel; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage/src/main/java/org/keycloak/storage/federated/UserRoleMappingsFederatedStorage.java b/model/storage/src/main/java/org/keycloak/storage/federated/UserRoleMappingsFederatedStorage.java index e99ee212d19..93c56cdf528 100644 --- a/model/storage/src/main/java/org/keycloak/storage/federated/UserRoleMappingsFederatedStorage.java +++ b/model/storage/src/main/java/org/keycloak/storage/federated/UserRoleMappingsFederatedStorage.java @@ -16,11 +16,11 @@ */ package org.keycloak.storage.federated; +import java.util.stream.Stream; + import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/model/storage/src/main/java/org/keycloak/storage/user/ImportSynchronization.java b/model/storage/src/main/java/org/keycloak/storage/user/ImportSynchronization.java index f322aabdea2..22a8ae8abfe 100644 --- a/model/storage/src/main/java/org/keycloak/storage/user/ImportSynchronization.java +++ b/model/storage/src/main/java/org/keycloak/storage/user/ImportSynchronization.java @@ -16,11 +16,11 @@ */ package org.keycloak.storage.user; +import java.util.Date; + import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.storage.UserStorageProviderModel; -import java.util.Date; - /** * This is an optional capability interface intended to be implemented by any * {@link org.keycloak.storage.UserStorageProviderFactory UserStorageProviderFactory} that supports diff --git a/model/storage/src/main/java/org/keycloak/utils/ServicesUtils.java b/model/storage/src/main/java/org/keycloak/utils/ServicesUtils.java index 718fe282a18..ff4a9e05300 100644 --- a/model/storage/src/main/java/org/keycloak/utils/ServicesUtils.java +++ b/model/storage/src/main/java/org/keycloak/utils/ServicesUtils.java @@ -17,16 +17,17 @@ package org.keycloak.utils; -import org.jboss.logging.Logger; -import org.keycloak.executors.ExecutorsProvider; -import org.keycloak.models.KeycloakSession; - import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Stream; +import org.keycloak.executors.ExecutorsProvider; +import org.keycloak.models.KeycloakSession; + +import org.jboss.logging.Logger; + import static org.keycloak.common.util.StackUtil.getShortStackTrace; /** diff --git a/pom.xml b/pom.xml index 4a478968c40..c14d56229e5 100644 --- a/pom.xml +++ b/pom.xml @@ -1550,6 +1550,9 @@ + + java|javax,jakarta,org.keycloak,,\#java|javax,\#jakarta,\#org.keycloak,\# + diff --git a/quarkus/config-api/src/main/java/org/keycloak/config/DatabaseOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/DatabaseOptions.java index 3ab1bbdd02f..40df81b003a 100644 --- a/quarkus/config-api/src/main/java/org/keycloak/config/DatabaseOptions.java +++ b/quarkus/config-api/src/main/java/org/keycloak/config/DatabaseOptions.java @@ -1,13 +1,13 @@ package org.keycloak.config; -import org.keycloak.config.database.Database; - import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.function.Consumer; +import org.keycloak.config.database.Database; + import static org.keycloak.config.OptionsUtil.DURATION_DESCRIPTION; import static org.keycloak.config.WildcardOptionsUtil.getWildcardNamedKey; diff --git a/quarkus/config-api/src/main/java/org/keycloak/config/EventOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/EventOptions.java index ca61130a373..306723b986c 100644 --- a/quarkus/config-api/src/main/java/org/keycloak/config/EventOptions.java +++ b/quarkus/config-api/src/main/java/org/keycloak/config/EventOptions.java @@ -42,5 +42,3 @@ public class EventOptions { } } - - diff --git a/quarkus/config-api/src/main/java/org/keycloak/config/FeatureOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/FeatureOptions.java index 40fdf020dc1..be98ffc0e3f 100644 --- a/quarkus/config-api/src/main/java/org/keycloak/config/FeatureOptions.java +++ b/quarkus/config-api/src/main/java/org/keycloak/config/FeatureOptions.java @@ -1,13 +1,13 @@ package org.keycloak.config; -import org.keycloak.common.Profile; - import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import org.keycloak.common.Profile; + public class FeatureOptions { public static final Option> FEATURES = OptionBuilder.listOptionBuilder("features", String.class) diff --git a/quarkus/config-api/src/main/java/org/keycloak/config/LoggingOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/LoggingOptions.java index cf62db46e4e..c26bef0f08a 100644 --- a/quarkus/config-api/src/main/java/org/keycloak/config/LoggingOptions.java +++ b/quarkus/config-api/src/main/java/org/keycloak/config/LoggingOptions.java @@ -1,8 +1,5 @@ package org.keycloak.config; -import io.quarkus.runtime.logging.LogRuntimeConfig; -import org.jboss.logmanager.handlers.SyslogHandler; - import java.io.File; import java.util.Arrays; import java.util.List; @@ -10,6 +7,9 @@ import java.util.Locale; import java.util.Optional; import java.util.function.Function; +import io.quarkus.runtime.logging.LogRuntimeConfig; +import org.jboss.logmanager.handlers.SyslogHandler; + import static java.lang.String.format; public class LoggingOptions { diff --git a/quarkus/config-api/src/main/java/org/keycloak/config/Option.java b/quarkus/config-api/src/main/java/org/keycloak/config/Option.java index 6d2122bb703..a9ac1623612 100644 --- a/quarkus/config-api/src/main/java/org/keycloak/config/Option.java +++ b/quarkus/config-api/src/main/java/org/keycloak/config/Option.java @@ -1,12 +1,12 @@ package org.keycloak.config; -import com.google.common.base.CaseFormat; - import java.util.List; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import com.google.common.base.CaseFormat; + public class Option { private final Class type; private final Class componentType; diff --git a/quarkus/config-api/src/main/java/org/keycloak/config/OptionBuilder.java b/quarkus/config-api/src/main/java/org/keycloak/config/OptionBuilder.java index 5d696c68b83..a6294b88083 100644 --- a/quarkus/config-api/src/main/java/org/keycloak/config/OptionBuilder.java +++ b/quarkus/config-api/src/main/java/org/keycloak/config/OptionBuilder.java @@ -1,7 +1,5 @@ package org.keycloak.config; -import io.smallrye.common.constraint.Assert; - import java.util.Arrays; import java.util.Collection; import java.util.HashSet; @@ -12,6 +10,8 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import io.smallrye.common.constraint.Assert; + @SuppressWarnings({"unchecked", "OptionalUsedAsFieldOrParameterType", "rawtypes"}) public class OptionBuilder { diff --git a/quarkus/config-api/src/main/java/org/keycloak/config/SecurityOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/SecurityOptions.java index 236dfd74b6c..56368382832 100644 --- a/quarkus/config-api/src/main/java/org/keycloak/config/SecurityOptions.java +++ b/quarkus/config-api/src/main/java/org/keycloak/config/SecurityOptions.java @@ -1,11 +1,11 @@ package org.keycloak.config; -import org.keycloak.common.Profile; -import org.keycloak.common.crypto.FipsMode; - import java.util.Arrays; import java.util.List; +import org.keycloak.common.Profile; +import org.keycloak.common.crypto.FipsMode; + public class SecurityOptions { public static final Option FIPS_MODE = new OptionBuilder<>("fips-mode", FipsMode.class) diff --git a/quarkus/config-api/src/main/java/org/keycloak/config/TracingOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/TracingOptions.java index d4359ce2ca6..5204009f782 100644 --- a/quarkus/config-api/src/main/java/org/keycloak/config/TracingOptions.java +++ b/quarkus/config-api/src/main/java/org/keycloak/config/TracingOptions.java @@ -17,11 +17,11 @@ package org.keycloak.config; -import io.quarkus.opentelemetry.runtime.config.build.SamplerType; - import java.util.Arrays; import java.util.List; +import io.quarkus.opentelemetry.runtime.config.build.SamplerType; + public class TracingOptions { public static final Option TRACING_ENABLED = new OptionBuilder<>("tracing-enabled", Boolean.class) diff --git a/quarkus/config-api/src/main/java/org/keycloak/config/TruststoreOptions.java b/quarkus/config-api/src/main/java/org/keycloak/config/TruststoreOptions.java index ac621d7f2bc..f00c8239f9d 100644 --- a/quarkus/config-api/src/main/java/org/keycloak/config/TruststoreOptions.java +++ b/quarkus/config-api/src/main/java/org/keycloak/config/TruststoreOptions.java @@ -1,9 +1,9 @@ package org.keycloak.config; -import org.keycloak.common.enums.HostnameVerificationPolicy; - import java.util.List; +import org.keycloak.common.enums.HostnameVerificationPolicy; + public class TruststoreOptions { public static final Option> TRUSTSTORE_PATHS = OptionBuilder.listOptionBuilder("truststore-paths", String.class) diff --git a/quarkus/config-api/src/main/java/org/keycloak/config/database/Database.java b/quarkus/config-api/src/main/java/org/keycloak/config/database/Database.java index a6b052d0863..dc148acfe8b 100644 --- a/quarkus/config-api/src/main/java/org/keycloak/config/database/Database.java +++ b/quarkus/config-api/src/main/java/org/keycloak/config/database/Database.java @@ -17,10 +17,6 @@ package org.keycloak.config.database; -import io.quarkus.runtime.util.StringUtil; -import org.keycloak.config.DatabaseOptions; -import org.keycloak.config.Option; - import java.io.File; import java.util.Arrays; import java.util.HashMap; @@ -32,6 +28,11 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; +import org.keycloak.config.DatabaseOptions; +import org.keycloak.config.Option; + +import io.quarkus.runtime.util.StringUtil; + import static java.util.Arrays.asList; public final class Database { diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsIntegrationTest.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsIntegrationTest.java index 765074a2988..d2fea70ac18 100644 --- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsIntegrationTest.java +++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsIntegrationTest.java @@ -1,10 +1,10 @@ package org.keycloak.quarkus.deployment; +import org.keycloak.quarkus.runtime.Environment; + import io.quarkus.deployment.IsTest; import io.quarkus.runtime.LaunchMode; -import org.keycloak.quarkus.runtime.Environment; - public class IsIntegrationTest extends IsTest { public IsIntegrationTest(LaunchMode launchMode) { diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsManagementEnabled.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsManagementEnabled.java index bfd2661bd5c..1abadb6ec1b 100644 --- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsManagementEnabled.java +++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsManagementEnabled.java @@ -16,10 +16,10 @@ */ package org.keycloak.quarkus.deployment; -import org.keycloak.quarkus.runtime.configuration.mappers.ManagementPropertyMappers; - import java.util.function.BooleanSupplier; +import org.keycloak.quarkus.runtime.configuration.mappers.ManagementPropertyMappers; + public class IsManagementEnabled implements BooleanSupplier { @Override public boolean getAsBoolean() { diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsReAugmentation.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsReAugmentation.java index 6d065d8158e..3dbae075137 100644 --- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsReAugmentation.java +++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/IsReAugmentation.java @@ -18,6 +18,7 @@ package org.keycloak.quarkus.deployment; import java.util.function.BooleanSupplier; + import org.keycloak.quarkus.runtime.Environment; public class IsReAugmentation implements BooleanSupplier { diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java index 88cfe89a7ea..4a800a3883d 100644 --- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java +++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java @@ -17,65 +17,35 @@ package org.keycloak.quarkus.deployment; -import io.quarkus.agroal.runtime.DataSourcesJdbcBuildTimeConfig; -import io.quarkus.agroal.runtime.TransactionIntegration; -import io.quarkus.agroal.runtime.health.DataSourceHealthCheck; -import io.quarkus.agroal.spi.JdbcDataSourceBuildItem; -import io.quarkus.agroal.spi.JdbcDriverBuildItem; -import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem; -import io.quarkus.arc.deployment.BuildTimeConditionBuildItem; -import io.quarkus.bootstrap.logging.InitialConfigurator; -import io.quarkus.datasource.deployment.spi.DevServicesDatasourceResultBuildItem; -import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig; -import io.quarkus.deployment.IsDevelopment; -import io.quarkus.deployment.annotations.BuildProducer; -import io.quarkus.deployment.annotations.BuildStep; -import io.quarkus.deployment.annotations.Consume; -import io.quarkus.deployment.annotations.ExecutionTime; -import io.quarkus.deployment.annotations.Produce; -import io.quarkus.deployment.annotations.Record; -import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import io.quarkus.deployment.builditem.FeatureBuildItem; -import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; -import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; -import io.quarkus.deployment.builditem.IndexDependencyBuildItem; -import io.quarkus.deployment.builditem.StaticInitConfigBuilderBuildItem; -import io.quarkus.hibernate.orm.deployment.HibernateOrmConfig; -import io.quarkus.hibernate.orm.deployment.PersistenceXmlDescriptorBuildItem; -import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationRuntimeConfiguredBuildItem; -import io.quarkus.hibernate.orm.deployment.spi.AdditionalJpaModelBuildItem; -import io.quarkus.narayana.jta.runtime.TransactionManagerBuildTimeConfig; -import io.quarkus.narayana.jta.runtime.TransactionManagerBuildTimeConfig.UnsafeMultipleLastResourcesMode; -import io.quarkus.resteasy.reactive.server.spi.MethodScannerBuildItem; -import io.quarkus.resteasy.reactive.server.spi.PreExceptionMapperHandlerBuildItem; -import io.quarkus.runtime.LaunchMode; -import io.quarkus.runtime.configuration.ConfigurationException; -import io.quarkus.vertx.http.deployment.FilterBuildItem; -import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem; -import io.quarkus.vertx.http.deployment.ManagementInterfaceFilterBuildItem; -import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; -import io.quarkus.vertx.http.deployment.RouteBuildItem; -import io.quarkus.vertx.http.runtime.security.SecurityHandlerPriorities; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.NoSuchElementException; +import java.util.Optional; +import java.util.Properties; +import java.util.ServiceLoader; +import java.util.Set; +import java.util.function.BiConsumer; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.logging.Handler; + import jakarta.persistence.Entity; import jakarta.persistence.PersistenceUnitTransactionType; -import org.eclipse.microprofile.config.spi.ConfigSource; -import org.hibernate.cfg.JdbcSettings; -import org.eclipse.microprofile.health.Readiness; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; -import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; -import org.hibernate.jpa.boot.spi.PersistenceXmlParser; -import org.infinispan.protostream.SerializationContextInitializer; -import org.jboss.jandex.AnnotationInstance; -import org.jboss.jandex.AnnotationTarget; -import org.jboss.jandex.AnnotationTransformation; -import org.jboss.jandex.ClassInfo; -import org.jboss.jandex.DotName; -import org.jboss.jandex.IndexView; -import org.jboss.jandex.MethodInfo; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer; -import org.jboss.resteasy.reactive.server.processor.scanning.MethodScanner; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticatorSpi; import org.keycloak.authentication.authenticators.browser.DeployedScriptAuthenticatorFactory; @@ -147,31 +117,63 @@ import org.keycloak.utils.StringUtil; import org.keycloak.vault.FilesKeystoreVaultProviderFactory; import org.keycloak.vault.FilesPlainTextVaultProviderFactory; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.NoSuchElementException; -import java.util.Optional; -import java.util.Properties; -import java.util.ServiceLoader; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.jar.JarEntry; -import java.util.jar.JarFile; -import java.util.logging.Handler; +import io.quarkus.agroal.runtime.DataSourcesJdbcBuildTimeConfig; +import io.quarkus.agroal.runtime.TransactionIntegration; +import io.quarkus.agroal.runtime.health.DataSourceHealthCheck; +import io.quarkus.agroal.spi.JdbcDataSourceBuildItem; +import io.quarkus.agroal.spi.JdbcDriverBuildItem; +import io.quarkus.arc.deployment.AnnotationsTransformerBuildItem; +import io.quarkus.arc.deployment.BuildTimeConditionBuildItem; +import io.quarkus.bootstrap.logging.InitialConfigurator; +import io.quarkus.datasource.deployment.spi.DevServicesDatasourceResultBuildItem; +import io.quarkus.datasource.runtime.DataSourcesBuildTimeConfig; +import io.quarkus.deployment.IsDevelopment; +import io.quarkus.deployment.annotations.BuildProducer; +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Consume; +import io.quarkus.deployment.annotations.ExecutionTime; +import io.quarkus.deployment.annotations.Produce; +import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; +import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.GeneratedResourceBuildItem; +import io.quarkus.deployment.builditem.HotDeploymentWatchedFileBuildItem; +import io.quarkus.deployment.builditem.IndexDependencyBuildItem; +import io.quarkus.deployment.builditem.StaticInitConfigBuilderBuildItem; +import io.quarkus.hibernate.orm.deployment.HibernateOrmConfig; +import io.quarkus.hibernate.orm.deployment.PersistenceXmlDescriptorBuildItem; +import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationRuntimeConfiguredBuildItem; +import io.quarkus.hibernate.orm.deployment.spi.AdditionalJpaModelBuildItem; +import io.quarkus.narayana.jta.runtime.TransactionManagerBuildTimeConfig; +import io.quarkus.narayana.jta.runtime.TransactionManagerBuildTimeConfig.UnsafeMultipleLastResourcesMode; +import io.quarkus.resteasy.reactive.server.spi.MethodScannerBuildItem; +import io.quarkus.resteasy.reactive.server.spi.PreExceptionMapperHandlerBuildItem; +import io.quarkus.runtime.LaunchMode; +import io.quarkus.runtime.configuration.ConfigurationException; +import io.quarkus.vertx.http.deployment.FilterBuildItem; +import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem; +import io.quarkus.vertx.http.deployment.ManagementInterfaceFilterBuildItem; +import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem; +import io.quarkus.vertx.http.deployment.RouteBuildItem; +import io.quarkus.vertx.http.runtime.security.SecurityHandlerPriorities; +import org.eclipse.microprofile.config.spi.ConfigSource; +import org.eclipse.microprofile.health.Readiness; +import org.hibernate.cfg.AvailableSettings; +import org.hibernate.cfg.JdbcSettings; +import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; +import org.hibernate.jpa.boot.spi.PersistenceUnitDescriptor; +import org.hibernate.jpa.boot.spi.PersistenceXmlParser; +import org.infinispan.protostream.SerializationContextInitializer; +import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.AnnotationTarget; +import org.jboss.jandex.AnnotationTransformation; +import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.DotName; +import org.jboss.jandex.IndexView; +import org.jboss.jandex.MethodInfo; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer; +import org.jboss.resteasy.reactive.server.processor.scanning.MethodScanner; import static org.keycloak.config.DatabaseOptions.DB; import static org.keycloak.connections.jpa.util.JpaUtils.loadSpecificNamedQueries; diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/LiquibaseProcessor.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/LiquibaseProcessor.java index 3059d2353fd..097a844b23e 100644 --- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/LiquibaseProcessor.java +++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/LiquibaseProcessor.java @@ -10,24 +10,24 @@ import java.util.List; import java.util.Map; import java.util.Set; -import io.quarkus.agroal.spi.JdbcDataSourceBuildItem; -import io.quarkus.deployment.builditem.CombinedIndexBuildItem; -import org.jboss.jandex.AnnotationInstance; -import org.jboss.jandex.ClassInfo; -import org.jboss.jandex.DotName; -import org.jboss.jandex.IndexView; import org.keycloak.connections.jpa.updater.liquibase.lock.DummyLockService; +import org.keycloak.quarkus.runtime.KeycloakRecorder; +import io.quarkus.agroal.spi.JdbcDataSourceBuildItem; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import liquibase.database.Database; import liquibase.lockservice.LockService; import liquibase.parser.ChangeLogParser; import liquibase.parser.core.xml.XMLChangeLogSAXParser; import liquibase.servicelocator.LiquibaseService; import liquibase.sqlgenerator.SqlGenerator; -import org.keycloak.quarkus.runtime.KeycloakRecorder; +import org.jboss.jandex.AnnotationInstance; +import org.jboss.jandex.ClassInfo; +import org.jboss.jandex.DotName; +import org.jboss.jandex.IndexView; import static org.keycloak.quarkus.deployment.KeycloakProcessor.getDefaultDataSource; diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/UserProfileBuildItem.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/UserProfileBuildItem.java index d88be338fc0..f7b69ef5c73 100644 --- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/UserProfileBuildItem.java +++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/UserProfileBuildItem.java @@ -17,9 +17,10 @@ package org.keycloak.quarkus.deployment; -import io.quarkus.builder.item.SimpleBuildItem; import org.keycloak.representations.userprofile.config.UPConfig; +import io.quarkus.builder.item.SimpleBuildItem; + /** * Build item that store default configuration for a User Profile provider */ diff --git a/quarkus/deployment/src/test/java/org/keycloak/quarkus/deployment/PersistenceXmlDatasourcesTest.java b/quarkus/deployment/src/test/java/org/keycloak/quarkus/deployment/PersistenceXmlDatasourcesTest.java index a7ca97bddc4..15fb99e8f80 100644 --- a/quarkus/deployment/src/test/java/org/keycloak/quarkus/deployment/PersistenceXmlDatasourcesTest.java +++ b/quarkus/deployment/src/test/java/org/keycloak/quarkus/deployment/PersistenceXmlDatasourcesTest.java @@ -1,5 +1,18 @@ package org.keycloak.quarkus.deployment; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.List; +import java.util.function.Consumer; + +import org.keycloak.Config; +import org.keycloak.quarkus.runtime.Environment; +import org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource; +import org.keycloak.quarkus.runtime.configuration.Configuration; +import org.keycloak.quarkus.runtime.configuration.KeycloakConfigSourceProvider; +import org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider; + import io.smallrye.config.SmallRyeConfig; import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.JdbcSettings; @@ -7,26 +20,15 @@ import org.hibernate.jpa.boot.internal.ParsedPersistenceXmlDescriptor; import org.hibernate.jpa.boot.spi.PersistenceXmlParser; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.keycloak.Config; -import org.keycloak.quarkus.runtime.Environment; -import org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource; -import org.keycloak.quarkus.runtime.configuration.Configuration; -import org.keycloak.quarkus.runtime.configuration.KeycloakConfigSourceProvider; -import org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; -import java.util.function.Consumer; +import static org.keycloak.quarkus.deployment.KeycloakProcessor.configurePersistenceUnitProperties; +import static org.keycloak.quarkus.deployment.KeycloakProcessor.getDatasourceNameFromPersistenceXml; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.keycloak.quarkus.deployment.KeycloakProcessor.configurePersistenceUnitProperties; -import static org.keycloak.quarkus.deployment.KeycloakProcessor.getDatasourceNameFromPersistenceXml; import static org.wildfly.common.Assert.assertNotNull; public class PersistenceXmlDatasourcesTest { diff --git a/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakMetricsConfigurationTest.java b/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakMetricsConfigurationTest.java index f2b3bc27c1c..d074ad02b79 100644 --- a/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakMetricsConfigurationTest.java +++ b/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakMetricsConfigurationTest.java @@ -16,14 +16,13 @@ */ package test.org.keycloak.quarkus.services.health; -import static io.restassured.RestAssured.given; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; import io.restassured.RestAssured; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static io.restassured.RestAssured.given; @QuarkusTest @TestProfile(MetricsEnabledProfile.class) diff --git a/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakNegativeHealthCheckTest.java b/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakNegativeHealthCheckTest.java index 14f32f2ef12..cb151ce5a33 100644 --- a/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakNegativeHealthCheckTest.java +++ b/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakNegativeHealthCheckTest.java @@ -16,13 +16,7 @@ */ package test.org.keycloak.quarkus.services.health; -import static io.restassured.RestAssured.given; - -import org.eclipse.microprofile.health.HealthCheckResponse; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Test; import org.keycloak.quarkus.runtime.services.health.KeycloakReadyHealthCheck; -import org.mockito.Mockito; import io.agroal.api.AgroalDataSource; import io.agroal.api.AgroalDataSourceMetrics; @@ -31,6 +25,12 @@ import io.quarkus.test.InjectMock; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; import io.restassured.RestAssured; +import org.eclipse.microprofile.health.HealthCheckResponse; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import static io.restassured.RestAssured.given; @QuarkusTest @TestProfile(MetricsEnabledProfile.class) diff --git a/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakPathConfigurationTest.java b/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakPathConfigurationTest.java index 834f31a51cc..761f04a792e 100644 --- a/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakPathConfigurationTest.java +++ b/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakPathConfigurationTest.java @@ -16,15 +16,14 @@ */ package test.org.keycloak.quarkus.services.health; -import static io.restassured.RestAssured.given; -import static org.hamcrest.CoreMatchers.is; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.TestProfile; import io.restassured.RestAssured; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.CoreMatchers.is; @QuarkusTest @TestProfile(MetricsEnabledProfileWithPath.class) diff --git a/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakReadyHealthCheckTest.java b/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakReadyHealthCheckTest.java index 95aaffbaa93..75f90f1da32 100644 --- a/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakReadyHealthCheckTest.java +++ b/quarkus/deployment/src/test/java/test/org/keycloak/quarkus/services/health/KeycloakReadyHealthCheckTest.java @@ -16,15 +16,14 @@ */ package test.org.keycloak.quarkus.services.health; -import static io.restassured.RestAssured.given; - +import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.test.junit.TestProfile; +import io.restassured.RestAssured; import org.hamcrest.Matchers; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.quarkus.test.junit.QuarkusTest; -import io.quarkus.test.junit.TestProfile; -import io.restassured.RestAssured; +import static io.restassured.RestAssured.given; @QuarkusTest @TestProfile(MetricsEnabledProfile.class) diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Environment.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Environment.java index 4d588eb5fe2..2472e8c527a 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Environment.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Environment.java @@ -28,13 +28,13 @@ import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; -import io.quarkus.runtime.LaunchMode; -import io.smallrye.config.SmallRyeConfig; - import org.keycloak.common.Profile; import org.keycloak.common.util.NetworkUtils; import org.keycloak.quarkus.runtime.configuration.Configuration; +import io.quarkus.runtime.LaunchMode; +import io.smallrye.config.SmallRyeConfig; + public final class Environment { public static final String KC_CONFIG_REBUILD_CHECK = "kc.config.rebuild-check"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java index d72001ae711..20bba07ab15 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakMain.java @@ -17,36 +17,34 @@ package org.keycloak.quarkus.runtime; -import static org.keycloak.quarkus.runtime.Environment.getKeycloakModeFromProfile; -import static org.keycloak.quarkus.runtime.Environment.isNonServerMode; -import static org.keycloak.quarkus.runtime.Environment.isTestLaunchMode; - import java.util.ArrayList; import java.util.List; import java.util.concurrent.ForkJoinPool; import jakarta.enterprise.context.ApplicationScoped; -import picocli.CommandLine; +import org.keycloak.common.Version; import org.keycloak.infinispan.util.InfinispanUtils; +import org.keycloak.quarkus.runtime.cli.ExecutionExceptionHandler; +import org.keycloak.quarkus.runtime.cli.Picocli; +import org.keycloak.quarkus.runtime.cli.PropertyException; +import org.keycloak.quarkus.runtime.cli.command.AbstractNonServerCommand; +import org.keycloak.quarkus.runtime.cli.command.DryRunMixin; import org.keycloak.quarkus.runtime.configuration.PersistedConfigSource; import org.keycloak.quarkus.runtime.integration.jaxrs.QuarkusKeycloakApplication; -import io.quarkus.bootstrap.runner.RunnerClassLoader; import io.quarkus.arc.Arc; +import io.quarkus.bootstrap.runner.RunnerClassLoader; import io.quarkus.runtime.ApplicationLifecycleManager; import io.quarkus.runtime.Quarkus; - -import org.jboss.logging.Logger; -import org.keycloak.quarkus.runtime.cli.PropertyException; -import org.keycloak.quarkus.runtime.cli.ExecutionExceptionHandler; -import org.keycloak.quarkus.runtime.cli.Picocli; -import org.keycloak.common.Version; -import org.keycloak.quarkus.runtime.cli.command.AbstractNonServerCommand; -import org.keycloak.quarkus.runtime.cli.command.DryRunMixin; - import io.quarkus.runtime.QuarkusApplication; import io.quarkus.runtime.annotations.QuarkusMain; +import org.jboss.logging.Logger; +import picocli.CommandLine; + +import static org.keycloak.quarkus.runtime.Environment.getKeycloakModeFromProfile; +import static org.keycloak.quarkus.runtime.Environment.isNonServerMode; +import static org.keycloak.quarkus.runtime.Environment.isTestLaunchMode; /** *

The main entry point, responsible for initialize and run the CLI as well as start the server. diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java index be4aaf0df29..e65aa8ef8bf 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java @@ -24,8 +24,6 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Stream; -import org.hibernate.cfg.AvailableSettings; -import org.infinispan.protostream.SerializationContextInitializer; import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.common.crypto.CryptoIntegration; @@ -58,6 +56,8 @@ import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; import liquibase.Scope; import liquibase.servicelocator.ServiceLocator; +import org.hibernate.cfg.AvailableSettings; +import org.infinispan.protostream.SerializationContextInitializer; @Recorder public class KeycloakRecorder { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Messages.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Messages.java index b0927ce9160..4c7462dc4f5 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Messages.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/Messages.java @@ -20,10 +20,11 @@ package org.keycloak.quarkus.runtime; import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand; import org.keycloak.quarkus.runtime.cli.command.Build; + +import org.jboss.logging.Logger; import picocli.CommandLine; public final class Messages { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/QuarkusSingleProfileConfigResolver.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/QuarkusSingleProfileConfigResolver.java index 7070511613c..6225070ac9e 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/QuarkusSingleProfileConfigResolver.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/QuarkusSingleProfileConfigResolver.java @@ -1,14 +1,14 @@ package org.keycloak.quarkus.runtime; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.common.profile.SingleProfileConfigResolver; import org.keycloak.config.FeatureOptions; import org.keycloak.config.WildcardOptionsUtil; import org.keycloak.quarkus.runtime.cli.PropertyException; import org.keycloak.quarkus.runtime.configuration.Configuration; -import java.util.HashMap; -import java.util.Map; - import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; public class QuarkusSingleProfileConfigResolver extends SingleProfileConfigResolver { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/ExecutionExceptionHandler.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/ExecutionExceptionHandler.java index cbc0f82399c..33bcfff5861 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/ExecutionExceptionHandler.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/ExecutionExceptionHandler.java @@ -17,24 +17,24 @@ package org.keycloak.quarkus.runtime.cli; -import static org.keycloak.quarkus.runtime.configuration.Configuration.getConfig; - import java.io.PrintWriter; import java.nio.file.FileSystemException; +import java.util.HashMap; +import java.util.Map; import java.util.Optional; -import org.jboss.logging.Logger; +import java.util.function.Function; + import org.keycloak.platform.Platform; import org.keycloak.quarkus.runtime.Environment; import org.keycloak.quarkus.runtime.Messages; import org.keycloak.quarkus.runtime.integration.QuarkusPlatform; import io.smallrye.config.ConfigValue; +import org.jboss.logging.Logger; import picocli.CommandLine; import picocli.CommandLine.ParseResult; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Function; +import static org.keycloak.quarkus.runtime.configuration.Configuration.getConfig; public final class ExecutionExceptionHandler implements CommandLine.IExecutionExceptionHandler { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Help.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Help.java index 37309f21d7c..578a9180913 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Help.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Help.java @@ -17,12 +17,6 @@ package org.keycloak.quarkus.runtime.cli; -import static org.keycloak.quarkus.runtime.cli.OptionRenderer.undecorateDuplicitOptionName; -import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers.getMapper; -import static org.keycloak.utils.StringUtil.removeSuffix; -import static picocli.CommandLine.Help.Column.Overflow.SPAN; -import static picocli.CommandLine.Help.Column.Overflow.WRAP; - import java.util.ArrayList; import java.util.Comparator; import java.util.Iterator; @@ -37,6 +31,13 @@ import picocli.CommandLine; import picocli.CommandLine.Model.ArgGroupSpec; import picocli.CommandLine.Model.OptionSpec; +import static org.keycloak.quarkus.runtime.cli.OptionRenderer.undecorateDuplicitOptionName; +import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers.getMapper; +import static org.keycloak.utils.StringUtil.removeSuffix; + +import static picocli.CommandLine.Help.Column.Overflow.SPAN; +import static picocli.CommandLine.Help.Column.Overflow.WRAP; + public final class Help extends CommandLine.Help { static final String[] OPTION_NAMES = new String[] { "-h", "--help" }; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/OptionRenderer.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/OptionRenderer.java index f2c9e9d2761..79f80e1fa40 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/OptionRenderer.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/OptionRenderer.java @@ -18,6 +18,7 @@ package org.keycloak.quarkus.runtime.cli; import org.keycloak.utils.StringUtil; + import picocli.CommandLine; import picocli.CommandLine.Help.Ansi.Text; import picocli.CommandLine.Help.ColorScheme; @@ -26,6 +27,7 @@ import picocli.CommandLine.Model.OptionSpec; import static org.keycloak.quarkus.runtime.cli.Picocli.NO_PARAM_LABEL; import static org.keycloak.utils.StringUtil.removeSuffix; + import static picocli.CommandLine.Help.Ansi.OFF; public class OptionRenderer implements CommandLine.Help.IOptionRenderer { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java index 839244c9eaa..92093ed316e 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/Picocli.java @@ -17,15 +17,6 @@ package org.keycloak.quarkus.runtime.cli; -import static java.lang.String.format; -import static org.keycloak.quarkus.runtime.Environment.getProviderFiles; -import static org.keycloak.quarkus.runtime.Environment.isRebuildCheck; -import static org.keycloak.quarkus.runtime.cli.OptionRenderer.decorateDuplicitOptionName; -import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; -import static org.keycloak.quarkus.runtime.configuration.Configuration.isUserModifiable; -import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; -import static picocli.CommandLine.Model.UsageMessageSpec.SECTION_KEY_COMMAND_LIST; - import java.io.File; import java.io.PrintWriter; import java.util.ArrayList; @@ -48,10 +39,10 @@ import org.keycloak.config.OptionCategory; import org.keycloak.quarkus.runtime.Environment; import org.keycloak.quarkus.runtime.KeycloakMain; import org.keycloak.quarkus.runtime.Messages; +import org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand; import org.keycloak.quarkus.runtime.cli.command.AbstractCommand; import org.keycloak.quarkus.runtime.cli.command.AbstractNonServerCommand; import org.keycloak.quarkus.runtime.cli.command.HelpAllMixin; -import org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand; import org.keycloak.quarkus.runtime.cli.command.Main; import org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource; import org.keycloak.quarkus.runtime.configuration.Configuration; @@ -82,6 +73,17 @@ import picocli.CommandLine.Model.OptionSpec; import picocli.CommandLine.ParameterException; import picocli.CommandLine.ParseResult; +import static java.lang.String.format; + +import static org.keycloak.quarkus.runtime.Environment.getProviderFiles; +import static org.keycloak.quarkus.runtime.Environment.isRebuildCheck; +import static org.keycloak.quarkus.runtime.cli.OptionRenderer.decorateDuplicitOptionName; +import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; +import static org.keycloak.quarkus.runtime.configuration.Configuration.isUserModifiable; +import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; + +import static picocli.CommandLine.Model.UsageMessageSpec.SECTION_KEY_COMMAND_LIST; + public class Picocli { static final String PROVIDER_TIMESTAMP_ERROR = "A provider JAR was updated since the last build, please rebuild for this to be fully utilized."; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/ShortErrorMessageHandler.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/ShortErrorMessageHandler.java index 6c69fca88fa..54459fb0669 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/ShortErrorMessageHandler.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/ShortErrorMessageHandler.java @@ -1,8 +1,5 @@ package org.keycloak.quarkus.runtime.cli; -import static java.lang.String.format; -import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; - import java.io.PrintWriter; import java.util.Optional; import java.util.function.BooleanSupplier; @@ -23,6 +20,10 @@ import picocli.CommandLine.Model.OptionSpec; import picocli.CommandLine.ParameterException; import picocli.CommandLine.UnmatchedArgumentException; +import static java.lang.String.format; + +import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; + public class ShortErrorMessageHandler implements IParameterExceptionHandler { @Override diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractAutoBuildCommand.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractAutoBuildCommand.java index 573572ce9ae..092e684a7e8 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractAutoBuildCommand.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractAutoBuildCommand.java @@ -17,12 +17,6 @@ package org.keycloak.quarkus.runtime.cli.command; -import static org.keycloak.quarkus.runtime.Environment.isDevMode; -import static org.keycloak.quarkus.runtime.Environment.isDevProfile; -import static org.keycloak.quarkus.runtime.Environment.isRebuildCheck; -import static org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource.parseConfigArgs; -import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers.maskValue; - import java.util.ArrayList; import java.util.EnumSet; import java.util.List; @@ -41,6 +35,12 @@ import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; import picocli.CommandLine; +import static org.keycloak.quarkus.runtime.Environment.isDevMode; +import static org.keycloak.quarkus.runtime.Environment.isDevProfile; +import static org.keycloak.quarkus.runtime.Environment.isRebuildCheck; +import static org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource.parseConfigArgs; +import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers.maskValue; + public abstract class AbstractAutoBuildCommand extends AbstractCommand { public static final String OPTIMIZED_BUILD_OPTION_LONG = "--optimized"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractCommand.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractCommand.java index bf6b28596cd..7c319ed607a 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractCommand.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractCommand.java @@ -17,8 +17,6 @@ package org.keycloak.quarkus.runtime.cli.command; -import static org.keycloak.quarkus.runtime.Messages.cliExecutionError; - import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -34,6 +32,8 @@ import picocli.CommandLine; import picocli.CommandLine.Model.CommandSpec; import picocli.CommandLine.Spec; +import static org.keycloak.quarkus.runtime.Messages.cliExecutionError; + public abstract class AbstractCommand implements Callable { @Spec diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractNonServerCommand.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractNonServerCommand.java index bb449701285..a3a30b3be5e 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractNonServerCommand.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractNonServerCommand.java @@ -17,15 +17,15 @@ package org.keycloak.quarkus.runtime.cli.command; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.config.OptionCategory; import org.keycloak.quarkus.runtime.Environment; import org.keycloak.quarkus.runtime.integration.jaxrs.QuarkusKeycloakApplication; import picocli.CommandLine; -import java.util.List; -import java.util.stream.Collectors; - public abstract class AbstractNonServerCommand extends AbstractAutoBuildCommand { @CommandLine.Mixin diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractUpdatesCommand.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractUpdatesCommand.java index 1515e094afd..7492b18bcea 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractUpdatesCommand.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/AbstractUpdatesCommand.java @@ -28,6 +28,7 @@ import org.keycloak.common.Profile; import org.keycloak.compatibility.CompatibilityMetadataProvider; import org.keycloak.config.ConfigProviderFactory; import org.keycloak.quarkus.runtime.cli.PropertyException; + import picocli.CommandLine; public abstract class AbstractUpdatesCommand extends AbstractAutoBuildCommand { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java index ab5b9d21c91..29f7dcacc38 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Build.java @@ -17,11 +17,6 @@ package org.keycloak.quarkus.runtime.cli.command; -import static org.keycloak.config.ClassLoaderOptions.QUARKUS_REMOVED_ARTIFACTS_PROPERTY; -import static org.keycloak.config.DatabaseOptions.DB; -import static org.keycloak.quarkus.runtime.Environment.getHomePath; -import static org.keycloak.quarkus.runtime.Environment.isDevProfile; - import java.util.Optional; import org.keycloak.quarkus.runtime.Environment; @@ -35,6 +30,11 @@ import io.smallrye.config.ConfigValue; import picocli.CommandLine; import picocli.CommandLine.Command; +import static org.keycloak.config.ClassLoaderOptions.QUARKUS_REMOVED_ARTIFACTS_PROPERTY; +import static org.keycloak.config.DatabaseOptions.DB; +import static org.keycloak.quarkus.runtime.Environment.getHomePath; +import static org.keycloak.quarkus.runtime.Environment.isDevProfile; + @Command(name = Build.NAME, header = "Creates a new and optimized server image.", description = { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Export.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Export.java index fe501c2703f..de07af77a71 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Export.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Export.java @@ -17,13 +17,14 @@ package org.keycloak.quarkus.runtime.cli.command; -import static org.keycloak.exportimport.ExportImportConfig.ACTION_EXPORT; +import java.util.EnumSet; import org.keycloak.config.OptionCategory; import org.keycloak.exportimport.ExportImportConfig; + import picocli.CommandLine.Command; -import java.util.EnumSet; +import static org.keycloak.exportimport.ExportImportConfig.ACTION_EXPORT; @Command(name = Export.NAME, header = "Export data from realms to a file or directory.", diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Import.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Import.java index 1a1baf7907a..8fc10ba2568 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Import.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Import.java @@ -17,13 +17,14 @@ package org.keycloak.quarkus.runtime.cli.command; -import static org.keycloak.exportimport.ExportImportConfig.ACTION_IMPORT; +import java.util.EnumSet; import org.keycloak.config.OptionCategory; import org.keycloak.exportimport.ExportImportConfig; + import picocli.CommandLine.Command; -import java.util.EnumSet; +import static org.keycloak.exportimport.ExportImportConfig.ACTION_IMPORT; @Command(name = Import.NAME, header = "Import data from a directory or a file.", diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/ImportRealmMixin.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/ImportRealmMixin.java index 00f679986eb..4f42adb94c5 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/ImportRealmMixin.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/ImportRealmMixin.java @@ -17,8 +17,6 @@ package org.keycloak.quarkus.runtime.cli.command; -import static org.keycloak.quarkus.runtime.cli.Picocli.NO_PARAM_LABEL; - import java.io.File; import org.keycloak.exportimport.ExportImportConfig; @@ -26,6 +24,8 @@ import org.keycloak.quarkus.runtime.Environment; import picocli.CommandLine; +import static org.keycloak.quarkus.runtime.cli.Picocli.NO_PARAM_LABEL; + public final class ImportRealmMixin { public static final String IMPORT_REALM = "--import-realm"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Main.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Main.java index b8370253c0c..22efca66283 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Main.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Main.java @@ -17,7 +17,8 @@ package org.keycloak.quarkus.runtime.cli.command; -import static org.keycloak.quarkus.runtime.cli.Picocli.NO_PARAM_LABEL; +import java.nio.file.Files; +import java.nio.file.Path; import org.keycloak.quarkus.runtime.Environment; import org.keycloak.quarkus.runtime.cli.ExecutionExceptionHandler; @@ -28,8 +29,7 @@ import picocli.CommandLine.Command; import picocli.CommandLine.Option; import picocli.CommandLine.ScopeType; -import java.nio.file.Files; -import java.nio.file.Path; +import static org.keycloak.quarkus.runtime.cli.Picocli.NO_PARAM_LABEL; @Command(name = "keycloak", header = { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/ShowConfig.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/ShowConfig.java index c69e9232ba6..5f00c590975 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/ShowConfig.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/ShowConfig.java @@ -17,10 +17,6 @@ package org.keycloak.quarkus.runtime.cli.command; -import static org.keycloak.quarkus.runtime.configuration.Configuration.getConfigValue; -import static org.keycloak.quarkus.runtime.configuration.Configuration.getPropertyNames; -import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers.maskValue; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -38,6 +34,10 @@ import io.smallrye.config.ConfigValue; import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; +import static org.keycloak.quarkus.runtime.configuration.Configuration.getConfigValue; +import static org.keycloak.quarkus.runtime.configuration.Configuration.getPropertyNames; +import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers.maskValue; + @Command(name = "show-config", header = "Print out the current configuration.", description = "%nPrint out the current configuration.") diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Start.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Start.java index d82fa5201a4..803aae7d669 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Start.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/Start.java @@ -17,8 +17,6 @@ package org.keycloak.quarkus.runtime.cli.command; -import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; - import org.keycloak.quarkus.runtime.Environment; import org.keycloak.quarkus.runtime.Messages; import org.keycloak.quarkus.runtime.cli.PropertyException; @@ -26,6 +24,8 @@ import org.keycloak.quarkus.runtime.cli.PropertyException; import picocli.CommandLine; import picocli.CommandLine.Command; +import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; + @Command(name = Start.NAME, header = "Start the server.", description = { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/UpdateCompatibilityCheck.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/UpdateCompatibilityCheck.java index 853fdbae22b..2ae993c6e57 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/UpdateCompatibilityCheck.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/UpdateCompatibilityCheck.java @@ -17,14 +17,16 @@ package org.keycloak.quarkus.runtime.cli.command; -import com.fasterxml.jackson.core.type.TypeReference; import java.io.File; import java.io.IOException; import java.util.Map; + import org.keycloak.compatibility.CompatibilityResult; import org.keycloak.compatibility.Util; import org.keycloak.quarkus.runtime.cli.PropertyException; import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.type.TypeReference; import picocli.CommandLine; @CommandLine.Command( diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/UpdateCompatibilityMetadata.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/UpdateCompatibilityMetadata.java index 4d88b203f7d..b6295cc9100 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/UpdateCompatibilityMetadata.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/cli/command/UpdateCompatibilityMetadata.java @@ -17,14 +17,16 @@ package org.keycloak.quarkus.runtime.cli.command; -import com.fasterxml.jackson.core.JsonProcessingException; import java.io.File; import java.io.IOException; import java.util.Map; import java.util.stream.Collectors; + import org.keycloak.compatibility.CompatibilityMetadataProvider; import org.keycloak.quarkus.runtime.cli.PropertyException; import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.JsonProcessingException; import picocli.CommandLine; @CommandLine.Command( diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSource.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSource.java index 13006ff25d8..95a4d28c465 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSource.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSource.java @@ -17,8 +17,6 @@ package org.keycloak.quarkus.runtime.configuration; -import static org.keycloak.quarkus.runtime.cli.Picocli.ARG_SHORT_PREFIX; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -32,12 +30,14 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import io.smallrye.config.PropertiesConfigSource; - import org.keycloak.quarkus.runtime.cli.command.Main; import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper; import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; +import io.smallrye.config.PropertiesConfigSource; + +import static org.keycloak.quarkus.runtime.cli.Picocli.ARG_SHORT_PREFIX; + /** *

A configuration source for mapping configuration arguments to their corresponding properties so that they can be recognized * when building and running the server. diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java index 08d085d90eb..c96b28ced3d 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/Configuration.java @@ -17,19 +17,18 @@ package org.keycloak.quarkus.runtime.configuration; -import static org.keycloak.quarkus.runtime.cli.Picocli.ARG_PREFIX; - import java.util.Map; import java.util.Optional; import java.util.Properties; +import org.keycloak.config.Option; +import org.keycloak.utils.StringUtil; + import io.quarkus.runtime.configuration.ConfigUtils; import io.smallrye.config.ConfigValue; import io.smallrye.config.SmallRyeConfig; -import org.keycloak.config.Option; -import org.keycloak.utils.StringUtil; - +import static org.keycloak.quarkus.runtime.cli.Picocli.ARG_PREFIX; import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; /** diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/DisabledMappersInterceptor.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/DisabledMappersInterceptor.java index 87f4586b60a..76e180930ec 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/DisabledMappersInterceptor.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/DisabledMappersInterceptor.java @@ -17,15 +17,17 @@ package org.keycloak.quarkus.runtime.configuration; +import java.util.Iterator; + +import jakarta.annotation.Priority; + +import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; + import io.smallrye.config.ConfigSourceInterceptor; import io.smallrye.config.ConfigSourceInterceptorContext; import io.smallrye.config.ConfigValue; import io.smallrye.config.Priorities; -import jakarta.annotation.Priority; import org.apache.commons.collections4.iterators.FilterIterator; -import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; - -import java.util.Iterator; import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/IgnoredArtifacts.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/IgnoredArtifacts.java index 4cc3a8aba3b..3c2b77d9b7e 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/IgnoredArtifacts.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/IgnoredArtifacts.java @@ -16,9 +16,6 @@ */ package org.keycloak.quarkus.runtime.configuration; -import static java.util.Collections.emptySet; -import static org.keycloak.quarkus.runtime.Environment.getCurrentOrCreateFeatureProfile; - import java.util.Collection; import java.util.HashSet; import java.util.Set; @@ -30,6 +27,10 @@ import org.keycloak.config.HealthOptions; import org.keycloak.config.MetricsOptions; import org.keycloak.config.database.Database; +import static java.util.Collections.emptySet; + +import static org.keycloak.quarkus.runtime.Environment.getCurrentOrCreateFeatureProfile; + /** * Ignore particular artifacts based on build configuration */ diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KcEnvConfigSource.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KcEnvConfigSource.java index dee5d582875..d8fdc898415 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KcEnvConfigSource.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KcEnvConfigSource.java @@ -17,21 +17,22 @@ package org.keycloak.quarkus.runtime.configuration; -import static io.smallrye.config.common.utils.StringUtil.replaceNonAlphanumericByUnderscores; -import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; - import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.microprofile.config.spi.ConfigSource; import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper; import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; import org.keycloak.quarkus.runtime.configuration.mappers.WildcardPropertyMapper; import io.smallrye.config.EnvConfigSource; import io.smallrye.config.PropertiesConfigSource; +import org.eclipse.microprofile.config.spi.ConfigSource; + +import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; + +import static io.smallrye.config.common.utils.StringUtil.replaceNonAlphanumericByUnderscores; // Not extending EnvConfigSource as it's too smart for our own good. It does unnecessary mapping of provided keys // leading to e.g. duplicate entries (like kc.db-password and kc.db.password), or incorrectly handling getters due to diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KcUnmatchedArgumentException.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KcUnmatchedArgumentException.java index f7b0dc77b3b..792f2358f64 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KcUnmatchedArgumentException.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KcUnmatchedArgumentException.java @@ -17,11 +17,12 @@ package org.keycloak.quarkus.runtime.configuration; -import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; -import picocli.CommandLine; - import java.util.List; +import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; + +import picocli.CommandLine; + import static org.keycloak.quarkus.runtime.cli.OptionRenderer.DUPLICIT_OPTION_SUFFIX; /** diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KeycloakPropertiesConfigSource.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KeycloakPropertiesConfigSource.java index 374f3b8fa90..fda469dcf8b 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KeycloakPropertiesConfigSource.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/KeycloakPropertiesConfigSource.java @@ -17,8 +17,6 @@ package org.keycloak.quarkus.runtime.configuration; -import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; - import java.io.File; import java.io.IOException; import java.net.URI; @@ -30,13 +28,15 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.microprofile.config.spi.ConfigSource; -import org.eclipse.microprofile.config.spi.ConfigSourceProvider; import org.keycloak.quarkus.runtime.Environment; import io.smallrye.config.AbstractLocationConfigSourceLoader; import io.smallrye.config.PropertiesConfigSource; import io.smallrye.config.common.utils.ConfigSourceUtil; +import org.eclipse.microprofile.config.spi.ConfigSource; +import org.eclipse.microprofile.config.spi.ConfigSourceProvider; + +import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; /** * A configuration source for {@code keycloak.conf}. diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/MicroProfileConfigProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/MicroProfileConfigProvider.java index 7bafaad2957..05381f99ec6 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/MicroProfileConfigProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/MicroProfileConfigProvider.java @@ -17,18 +17,19 @@ package org.keycloak.quarkus.runtime.configuration; -import static org.keycloak.quarkus.runtime.configuration.Configuration.OPTION_PART_SEPARATOR; -import static org.keycloak.quarkus.runtime.configuration.Configuration.toDashCase; - import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import org.eclipse.microprofile.config.ConfigValue; + import org.keycloak.Config; import org.keycloak.Config.Scope; import io.smallrye.config.SmallRyeConfig; +import org.eclipse.microprofile.config.ConfigValue; + +import static org.keycloak.quarkus.runtime.configuration.Configuration.OPTION_PART_SEPARATOR; +import static org.keycloak.quarkus.runtime.configuration.Configuration.toDashCase; public class MicroProfileConfigProvider implements Config.ConfigProvider { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/NestedPropertyMappingInterceptor.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/NestedPropertyMappingInterceptor.java index aeabb161f41..ab9d967e0ab 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/NestedPropertyMappingInterceptor.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/NestedPropertyMappingInterceptor.java @@ -20,13 +20,14 @@ import java.util.LinkedHashSet; import java.util.Optional; import java.util.function.Function; +import jakarta.annotation.Priority; + import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; import io.smallrye.config.ConfigSourceInterceptor; import io.smallrye.config.ConfigSourceInterceptorContext; import io.smallrye.config.ConfigValue; import io.smallrye.config.Priorities; -import jakarta.annotation.Priority; /** * Some resolution of values that come from PropertyMappers diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PersistedConfigSource.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PersistedConfigSource.java index 70ca5e48825..025fda60773 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PersistedConfigSource.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PersistedConfigSource.java @@ -35,11 +35,12 @@ import java.util.function.Supplier; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import org.keycloak.quarkus.runtime.Environment; +import org.keycloak.quarkus.runtime.cli.Picocli; + import io.smallrye.config.ConfigValue; import io.smallrye.config.ConfigValue.ConfigValueBuilder; import io.smallrye.config.PropertiesConfigSource; -import org.keycloak.quarkus.runtime.Environment; -import org.keycloak.quarkus.runtime.cli.Picocli; /** * A {@link org.eclipse.microprofile.config.spi.ConfigSource} based on the configuration properties persisted into the server diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PropertyMappingInterceptor.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PropertyMappingInterceptor.java index d464eb97bd4..c86b0c2faf4 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PropertyMappingInterceptor.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/PropertyMappingInterceptor.java @@ -16,9 +16,6 @@ */ package org.keycloak.quarkus.runtime.configuration; -import static org.keycloak.quarkus.runtime.Environment.isRebuild; -import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; - import java.util.Iterator; import java.util.Objects; import java.util.Optional; @@ -26,17 +23,21 @@ import java.util.Set; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import org.apache.commons.collections4.IteratorUtils; +import jakarta.annotation.Priority; + import org.keycloak.config.OptionCategory; import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper; import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; +import org.keycloak.quarkus.runtime.configuration.mappers.WildcardPropertyMapper; import io.smallrye.config.ConfigSourceInterceptor; import io.smallrye.config.ConfigSourceInterceptorContext; import io.smallrye.config.ConfigValue; import io.smallrye.config.Priorities; -import jakarta.annotation.Priority; -import org.keycloak.quarkus.runtime.configuration.mappers.WildcardPropertyMapper; +import org.apache.commons.collections4.IteratorUtils; + +import static org.keycloak.quarkus.runtime.Environment.isRebuild; +import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; /** *

This interceptor is responsible for mapping Keycloak properties to their corresponding properties in Quarkus. diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/QuarkusPropertiesConfigSource.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/QuarkusPropertiesConfigSource.java index cb0e18abe6e..9d517e1a2fd 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/QuarkusPropertiesConfigSource.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/QuarkusPropertiesConfigSource.java @@ -17,8 +17,6 @@ package org.keycloak.quarkus.runtime.configuration; -import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_QUARKUS; - import java.io.File; import java.io.IOException; import java.net.URL; @@ -27,13 +25,15 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.eclipse.microprofile.config.spi.ConfigSource; -import org.eclipse.microprofile.config.spi.ConfigSourceProvider; import org.keycloak.quarkus.runtime.Environment; import io.smallrye.config.AbstractLocationConfigSourceLoader; import io.smallrye.config.PropertiesConfigSource; import io.smallrye.config.common.utils.ConfigSourceUtil; +import org.eclipse.microprofile.config.spi.ConfigSource; +import org.eclipse.microprofile.config.spi.ConfigSourceProvider; + +import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_QUARKUS; /** * A configuration source for {@code quarkus.properties}. diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java index 2839dc2f55f..43dc5aa6385 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/compatibility/DatabaseCompatibilityMetadataProvider.java @@ -1,8 +1,5 @@ package org.keycloak.quarkus.runtime.configuration.compatibility; -import static org.keycloak.quarkus.runtime.configuration.Configuration.getConfigValue; -import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalKcValue; - import java.util.HashMap; import java.util.Map; import java.util.Optional; @@ -13,6 +10,9 @@ import org.keycloak.config.Option; import io.smallrye.config.ConfigValue; +import static org.keycloak.quarkus.runtime.configuration.Configuration.getConfigValue; +import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalKcValue; + public class DatabaseCompatibilityMetadataProvider implements CompatibilityMetadataProvider { public static final String ID = "database"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/BootstrapAdminPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/BootstrapAdminPropertyMappers.java index de2635b25ed..e955b551751 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/BootstrapAdminPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/BootstrapAdminPropertyMappers.java @@ -17,13 +17,13 @@ package org.keycloak.quarkus.runtime.configuration.mappers; +import java.util.List; + import org.keycloak.config.BootstrapAdminOptions; import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalKcValue; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; -import java.util.List; - public final class BootstrapAdminPropertyMappers implements PropertyMapperGrouping { private static final String PASSWORD_SET = "bootstrap admin password is set"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/CachingPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/CachingPropertyMappers.java index ef96c12cedb..4c4d069ace3 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/CachingPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/CachingPropertyMappers.java @@ -1,8 +1,5 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalKcValue; -import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; - import java.io.File; import java.nio.file.Files; import java.nio.file.Paths; @@ -21,9 +18,11 @@ import org.keycloak.quarkus.runtime.configuration.Configuration; import org.keycloak.utils.StringUtil; import com.google.common.base.CaseFormat; - import io.smallrye.config.ConfigSourceInterceptorContext; +import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalKcValue; +import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; + final class CachingPropertyMappers implements PropertyMapperGrouping { private static final String REMOTE_HOST_SET = "remote host is set"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ClassLoaderPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ClassLoaderPropertyMappers.java index 9d1cdf32b3b..b264146104b 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ClassLoaderPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ClassLoaderPropertyMappers.java @@ -1,15 +1,16 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import io.smallrye.config.ConfigSourceInterceptorContext; +import java.util.List; + import org.keycloak.config.ClassLoaderOptions; import org.keycloak.quarkus.runtime.Environment; import org.keycloak.quarkus.runtime.configuration.IgnoredArtifacts; +import io.smallrye.config.ConfigSourceInterceptorContext; + import static org.keycloak.config.ClassLoaderOptions.QUARKUS_REMOVED_ARTIFACTS_PROPERTY; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; -import java.util.List; - final class ClassLoaderPropertyMappers implements PropertyMapperGrouping { @Override diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ConfigKeystorePropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ConfigKeystorePropertyMappers.java index 05cec6dc6c0..b19fc5298db 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ConfigKeystorePropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ConfigKeystorePropertyMappers.java @@ -1,13 +1,14 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import io.smallrye.config.ConfigSourceInterceptorContext; -import org.keycloak.config.ConfigKeystoreOptions; -import org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider; - import java.nio.file.Files; import java.nio.file.Path; import java.util.List; +import org.keycloak.config.ConfigKeystoreOptions; +import org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider; + +import io.smallrye.config.ConfigSourceInterceptorContext; + import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; public final class ConfigKeystorePropertyMappers implements PropertyMapperGrouping { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java index 44ae3630053..b5f0df6476a 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/DatabasePropertyMappers.java @@ -1,17 +1,5 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import io.quarkus.datasource.common.runtime.DatabaseKind; -import io.smallrye.config.ConfigSourceInterceptorContext; -import io.smallrye.config.ConfigValue; -import org.jboss.logging.Logger; -import org.keycloak.config.DatabaseOptions; -import org.keycloak.config.Option; -import org.keycloak.config.OptionBuilder; -import org.keycloak.config.TransactionOptions; -import org.keycloak.config.database.Database; -import org.keycloak.quarkus.runtime.configuration.Configuration; -import org.keycloak.utils.StringUtil; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -20,6 +8,19 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.function.Supplier; +import org.keycloak.config.DatabaseOptions; +import org.keycloak.config.Option; +import org.keycloak.config.OptionBuilder; +import org.keycloak.config.TransactionOptions; +import org.keycloak.config.database.Database; +import org.keycloak.quarkus.runtime.configuration.Configuration; +import org.keycloak.utils.StringUtil; + +import io.quarkus.datasource.common.runtime.DatabaseKind; +import io.smallrye.config.ConfigSourceInterceptorContext; +import io.smallrye.config.ConfigValue; +import org.jboss.logging.Logger; + import static org.keycloak.config.DatabaseOptions.DB; import static org.keycloak.config.DatabaseOptions.Datasources.OPTIONS_DATASOURCES; import static org.keycloak.config.DatabaseOptions.Datasources.getDatasourceOption; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/EventPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/EventPropertyMappers.java index d594ce15a2a..fe544c8eaf0 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/EventPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/EventPropertyMappers.java @@ -1,5 +1,7 @@ package org.keycloak.quarkus.runtime.configuration.mappers; +import java.util.List; + import org.keycloak.common.Profile; import static org.keycloak.config.EventOptions.USER_EVENT_METRICS_ENABLED; @@ -10,8 +12,6 @@ import static org.keycloak.quarkus.runtime.configuration.mappers.MetricsProperty import static org.keycloak.quarkus.runtime.configuration.mappers.MetricsPropertyMappers.metricsEnabled; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; -import java.util.List; - final class EventPropertyMappers implements PropertyMapperGrouping { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ExportPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ExportPropertyMappers.java index bd0e73a0210..561c10237bf 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ExportPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ExportPropertyMappers.java @@ -17,8 +17,8 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import io.smallrye.config.ConfigSourceInterceptorContext; -import io.smallrye.config.ConfigValue; +import java.util.List; + import org.keycloak.config.ExportOptions; import org.keycloak.config.Option; import org.keycloak.config.OptionBuilder; @@ -29,13 +29,14 @@ import org.keycloak.quarkus.runtime.cli.PropertyException; import org.keycloak.quarkus.runtime.cli.command.Export; import org.keycloak.quarkus.runtime.configuration.Configuration; +import io.smallrye.config.ConfigSourceInterceptorContext; +import io.smallrye.config.ConfigValue; + import static org.keycloak.exportimport.ExportImportConfig.PROVIDER; import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalValue; import static org.keycloak.quarkus.runtime.configuration.Configuration.isBlank; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; -import java.util.List; - public final class ExportPropertyMappers implements PropertyMapperGrouping { private static final String EXPORTER_PROPERTY = "kc.spi-export--exporter"; private static final String SINGLE_FILE = "singleFile"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/FeaturePropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/FeaturePropertyMappers.java index c511f0cfe23..c38d7bf304d 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/FeaturePropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/FeaturePropertyMappers.java @@ -1,16 +1,16 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import org.keycloak.common.Profile; -import org.keycloak.common.Profile.Feature; -import org.keycloak.config.FeatureOptions; -import org.keycloak.quarkus.runtime.cli.PropertyException; - import java.util.List; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.keycloak.common.Profile; +import org.keycloak.common.Profile.Feature; +import org.keycloak.config.FeatureOptions; +import org.keycloak.quarkus.runtime.cli.PropertyException; + import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; public final class FeaturePropertyMappers implements PropertyMapperGrouping { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HealthPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HealthPropertyMappers.java index 8121f155fbe..e4e36940d94 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HealthPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HealthPropertyMappers.java @@ -1,11 +1,11 @@ package org.keycloak.quarkus.runtime.configuration.mappers; +import java.util.List; + import org.keycloak.config.HealthOptions; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; -import java.util.List; - final class HealthPropertyMappers implements PropertyMapperGrouping { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HostnameV2PropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HostnameV2PropertyMappers.java index 183ecd170bc..287ad42ce51 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HostnameV2PropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HostnameV2PropertyMappers.java @@ -1,7 +1,5 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; - import java.net.MalformedURLException; import java.net.URL; import java.util.Arrays; @@ -12,13 +10,15 @@ import java.util.stream.Stream; import org.keycloak.common.Profile; import org.keycloak.config.HostnameV2Options; import org.keycloak.config.HttpOptions; +import org.keycloak.config.ProxyOptions; import org.keycloak.quarkus.runtime.Environment; import org.keycloak.quarkus.runtime.cli.Picocli; import org.keycloak.quarkus.runtime.cli.command.AbstractCommand; -import org.keycloak.config.ProxyOptions; import org.keycloak.quarkus.runtime.configuration.Configuration; import org.keycloak.utils.SecureContextResolver; +import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; + public final class HostnameV2PropertyMappers implements PropertyMapperGrouping { private static final String CONTEXT_WARNING = "the server is running in an insecure context. Secure contexts are required for full functionality, including cross-origin cookies."; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpAccessLogPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpAccessLogPropertyMappers.java index 13dba9ff63f..50e737b2403 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpAccessLogPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpAccessLogPropertyMappers.java @@ -1,12 +1,12 @@ package org.keycloak.quarkus.runtime.configuration.mappers; +import java.util.List; + import org.keycloak.config.HttpAccessLogOptions; import org.keycloak.quarkus.runtime.configuration.Configuration; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; -import java.util.List; - public class HttpAccessLogPropertyMappers implements PropertyMapperGrouping { public static final String ACCESS_LOG_ENABLED_MSG = "HTTP Access log is enabled"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpPropertyMappers.java index f6b72e8d748..774dfc94d87 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/HttpPropertyMappers.java @@ -1,8 +1,11 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import io.quarkus.runtime.util.ClassPathUtils; -import io.quarkus.vertx.http.runtime.options.TlsUtils; -import io.smallrye.config.ConfigSourceInterceptorContext; +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; +import java.util.Optional; import org.keycloak.common.Profile; import org.keycloak.common.crypto.FipsMode; @@ -15,12 +18,9 @@ import org.keycloak.quarkus.runtime.cli.Picocli; import org.keycloak.quarkus.runtime.cli.PropertyException; import org.keycloak.quarkus.runtime.cli.command.AbstractCommand; -import java.io.File; -import java.io.IOException; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.List; -import java.util.Optional; +import io.quarkus.runtime.util.ClassPathUtils; +import io.quarkus.vertx.http.runtime.options.TlsUtils; +import io.smallrye.config.ConfigSourceInterceptorContext; import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalKcValue; import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalValue; @@ -222,4 +222,3 @@ public final class HttpPropertyMappers implements PropertyMapperGrouping { return value; } } - diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ImportPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ImportPropertyMappers.java index 72c1eea65cb..7d1de9c65ad 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ImportPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ImportPropertyMappers.java @@ -17,8 +17,8 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import io.smallrye.config.ConfigSourceInterceptorContext; -import io.smallrye.config.ConfigValue; +import java.util.List; + import org.keycloak.config.ImportOptions; import org.keycloak.config.Option; import org.keycloak.config.OptionBuilder; @@ -28,12 +28,13 @@ import org.keycloak.quarkus.runtime.cli.Picocli; import org.keycloak.quarkus.runtime.cli.PropertyException; import org.keycloak.quarkus.runtime.cli.command.Import; +import io.smallrye.config.ConfigSourceInterceptorContext; +import io.smallrye.config.ConfigValue; + import static org.keycloak.exportimport.ExportImportConfig.PROVIDER; import static org.keycloak.quarkus.runtime.configuration.Configuration.getOptionalValue; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; -import java.util.List; - public final class ImportPropertyMappers implements PropertyMapperGrouping { private static final String IMPORTER_PROPERTY = "kc.spi-import--importer"; private static final String SINGLE_FILE = "singleFile"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/LoggingPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/LoggingPropertyMappers.java index d3430b7a9ec..b377fa1f19a 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/LoggingPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/LoggingPropertyMappers.java @@ -1,13 +1,5 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import static org.keycloak.config.LoggingOptions.DEFAULT_LOG_FORMAT; -import static org.keycloak.config.LoggingOptions.LOG_CONSOLE_ENABLED; -import static org.keycloak.config.LoggingOptions.LOG_FILE_ENABLED; -import static org.keycloak.config.LoggingOptions.LOG_SYSLOG_ENABLED; -import static org.keycloak.quarkus.runtime.configuration.Configuration.isSet; -import static org.keycloak.quarkus.runtime.configuration.Configuration.isTrue; -import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; - import java.io.File; import java.util.HashMap; import java.util.LinkedHashMap; @@ -23,7 +15,6 @@ import java.util.logging.Level; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.logmanager.LogContext; import org.keycloak.common.Profile; import org.keycloak.config.LoggingOptions; import org.keycloak.config.Option; @@ -34,6 +25,15 @@ import org.keycloak.quarkus.runtime.configuration.Configuration; import io.quarkus.runtime.configuration.MemorySizeConverter; import io.smallrye.config.ConfigSourceInterceptorContext; +import org.jboss.logmanager.LogContext; + +import static org.keycloak.config.LoggingOptions.DEFAULT_LOG_FORMAT; +import static org.keycloak.config.LoggingOptions.LOG_CONSOLE_ENABLED; +import static org.keycloak.config.LoggingOptions.LOG_FILE_ENABLED; +import static org.keycloak.config.LoggingOptions.LOG_SYSLOG_ENABLED; +import static org.keycloak.quarkus.runtime.configuration.Configuration.isSet; +import static org.keycloak.quarkus.runtime.configuration.Configuration.isTrue; +import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; public final class LoggingPropertyMappers implements PropertyMapperGrouping { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ManagementPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ManagementPropertyMappers.java index 89e1129d85e..297b911e944 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ManagementPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ManagementPropertyMappers.java @@ -16,6 +16,8 @@ */ package org.keycloak.quarkus.runtime.configuration.mappers; +import java.util.List; + import org.keycloak.config.HealthOptions; import org.keycloak.config.HttpOptions; import org.keycloak.config.ManagementOptions; @@ -28,8 +30,6 @@ import static org.keycloak.config.ManagementOptions.LEGACY_OBSERVABILITY_INTERFA import static org.keycloak.quarkus.runtime.configuration.Configuration.isTrue; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; -import java.util.List; - public class ManagementPropertyMappers implements PropertyMapperGrouping { private static final String HTTP_MANAGEMENT_SCHEME_IS_INHERITED = "http-management-scheme is inherited"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/MetricsPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/MetricsPropertyMappers.java index 7ff1ba3168f..5e14cc3ec3f 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/MetricsPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/MetricsPropertyMappers.java @@ -1,12 +1,12 @@ package org.keycloak.quarkus.runtime.configuration.mappers; +import java.util.List; + import org.keycloak.config.MetricsOptions; import static org.keycloak.quarkus.runtime.configuration.Configuration.isTrue; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; -import java.util.List; - final class MetricsPropertyMappers implements PropertyMapperGrouping { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/OpenApiPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/OpenApiPropertyMappers.java index 272e3dc9dd8..1462d3df406 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/OpenApiPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/OpenApiPropertyMappers.java @@ -1,10 +1,10 @@ package org.keycloak.quarkus.runtime.configuration.mappers; +import java.util.List; + import org.keycloak.common.Profile; import org.keycloak.config.OpenApiOptions; -import java.util.List; - import static org.keycloak.quarkus.runtime.configuration.Configuration.isTrue; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java index 02147fc17b8..ec6bada2804 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMapper.java @@ -16,11 +16,6 @@ */ package org.keycloak.quarkus.runtime.configuration.mappers; -import static java.util.Optional.ofNullable; -import static org.keycloak.quarkus.runtime.configuration.Configuration.toCliFormat; -import static org.keycloak.quarkus.runtime.configuration.Configuration.toEnvVarFormat; -import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; - import java.util.Iterator; import java.util.List; import java.util.Objects; @@ -57,6 +52,12 @@ import io.smallrye.config.ConfigValue.ConfigValueBuilder; import io.smallrye.config.ExpressionConfigSourceInterceptor; import io.smallrye.config.Expressions; +import static java.util.Optional.ofNullable; + +import static org.keycloak.quarkus.runtime.configuration.Configuration.toCliFormat; +import static org.keycloak.quarkus.runtime.configuration.Configuration.toEnvVarFormat; +import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; + public class PropertyMapper { protected final Option option; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMappers.java index d6bd80bf9d3..5d79b802a02 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMappers.java @@ -1,10 +1,21 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import io.smallrye.config.ConfigSourceInterceptorContext; -import io.smallrye.config.ConfigValue; -import io.smallrye.config.Expressions; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.BiConsumer; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.MultivaluedHashMap; -import org.jboss.logging.Logger; + import org.keycloak.common.Profile; import org.keycloak.common.util.CollectionUtil; import org.keycloak.config.ConfigSupportLevel; @@ -19,19 +30,10 @@ import org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider; import org.keycloak.quarkus.runtime.configuration.NestedPropertyMappingInterceptor; import org.keycloak.quarkus.runtime.configuration.PersistedConfigSource; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.function.BiConsumer; -import java.util.Set; -import java.util.stream.Collectors; +import io.smallrye.config.ConfigSourceInterceptorContext; +import io.smallrye.config.ConfigValue; +import io.smallrye.config.Expressions; +import org.jboss.logging.Logger; import static org.keycloak.quarkus.runtime.Environment.isRebuild; import static org.keycloak.quarkus.runtime.Environment.isRebuildCheck; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ProxyPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ProxyPropertyMappers.java index 61ab0745fed..369207fbe87 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ProxyPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/ProxyPropertyMappers.java @@ -1,14 +1,15 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import io.smallrye.common.net.Inet; -import io.smallrye.config.ConfigSourceInterceptorContext; +import java.util.List; + import org.keycloak.config.ProxyOptions; import org.keycloak.quarkus.runtime.cli.PropertyException; import org.keycloak.quarkus.runtime.configuration.Configuration; -import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; +import io.smallrye.common.net.Inet; +import io.smallrye.config.ConfigSourceInterceptorContext; -import java.util.List; +import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; final class ProxyPropertyMappers implements PropertyMapperGrouping{ diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/SecurityPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/SecurityPropertyMappers.java index e1af9e353cb..da22876bae0 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/SecurityPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/SecurityPropertyMappers.java @@ -1,7 +1,5 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; - import java.util.List; import org.keycloak.common.Profile; @@ -11,6 +9,8 @@ import org.keycloak.config.SecurityOptions; import io.smallrye.config.ConfigSourceInterceptorContext; +import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; + final class SecurityPropertyMappers implements PropertyMapperGrouping { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TracingPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TracingPropertyMappers.java index b5d78c8ece1..c4218a4faa4 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TracingPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TracingPropertyMappers.java @@ -17,15 +17,6 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import io.smallrye.config.ConfigSourceInterceptorContext; -import org.keycloak.common.Profile; -import org.keycloak.config.TracingOptions; -import org.keycloak.quarkus.runtime.cli.PropertyException; -import org.keycloak.quarkus.runtime.configuration.Configuration; -import org.keycloak.utils.StringUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; @@ -34,6 +25,16 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.keycloak.common.Profile; +import org.keycloak.config.TracingOptions; +import org.keycloak.quarkus.runtime.cli.PropertyException; +import org.keycloak.quarkus.runtime.configuration.Configuration; +import org.keycloak.utils.StringUtil; + +import io.smallrye.config.ConfigSourceInterceptorContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import static org.keycloak.config.TracingOptions.TRACING_COMPRESSION; import static org.keycloak.config.TracingOptions.TRACING_ENABLED; import static org.keycloak.config.TracingOptions.TRACING_ENDPOINT; @@ -46,8 +47,8 @@ import static org.keycloak.config.TracingOptions.TRACING_RESOURCE_ATTRIBUTES; import static org.keycloak.config.TracingOptions.TRACING_SAMPLER_RATIO; import static org.keycloak.config.TracingOptions.TRACING_SAMPLER_TYPE; import static org.keycloak.config.TracingOptions.TRACING_SERVICE_NAME; -import static org.keycloak.config.WildcardOptionsUtil.getWildcardValue; import static org.keycloak.config.WildcardOptionsUtil.getWildcardPrefix; +import static org.keycloak.config.WildcardOptionsUtil.getWildcardValue; import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TransactionPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TransactionPropertyMappers.java index 01713dde0c8..94805798070 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TransactionPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TransactionPropertyMappers.java @@ -1,12 +1,12 @@ package org.keycloak.quarkus.runtime.configuration.mappers; -import io.smallrye.config.ConfigSourceInterceptorContext; +import java.util.List; import org.keycloak.config.TransactionOptions; -import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; +import io.smallrye.config.ConfigSourceInterceptorContext; -import java.util.List; +import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; public class TransactionPropertyMappers implements PropertyMapperGrouping { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TruststorePropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TruststorePropertyMappers.java index 629ff3c6d36..1896bc80c99 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TruststorePropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/TruststorePropertyMappers.java @@ -1,11 +1,11 @@ package org.keycloak.quarkus.runtime.configuration.mappers; +import java.util.List; + import org.keycloak.config.TruststoreOptions; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; -import java.util.List; - public class TruststorePropertyMappers implements PropertyMapperGrouping { @Override diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/VaultPropertyMappers.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/VaultPropertyMappers.java index 95606132378..58a6fe6e023 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/VaultPropertyMappers.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/configuration/mappers/VaultPropertyMappers.java @@ -1,11 +1,11 @@ package org.keycloak.quarkus.runtime.configuration.mappers; +import java.util.List; + import org.keycloak.config.VaultOptions; import static org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper.fromOption; -import java.util.List; - final class VaultPropertyMappers implements PropertyMapperGrouping { @Override diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusPlatform.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusPlatform.java index 7d0c5c48276..9e885eb1abe 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusPlatform.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/QuarkusPlatform.java @@ -22,11 +22,11 @@ import java.io.IOException; import java.nio.file.Path; import java.util.concurrent.atomic.AtomicBoolean; -import org.jboss.logging.Logger; import org.keycloak.platform.PlatformProvider; import org.keycloak.quarkus.runtime.Environment; import io.quarkus.runtime.Quarkus; +import org.jboss.logging.Logger; public class QuarkusPlatform implements PlatformProvider { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/cdi/KeycloakBeanProducer.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/cdi/KeycloakBeanProducer.java index cbca615c47b..c1e3a152ed7 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/cdi/KeycloakBeanProducer.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/cdi/KeycloakBeanProducer.java @@ -17,15 +17,15 @@ package org.keycloak.quarkus.runtime.integration.cdi; -import io.quarkus.arc.Unremovable; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Disposes; import org.keycloak.models.KeycloakSession; import org.keycloak.quarkus.runtime.transaction.TransactionalSessionHandler; import org.keycloak.utils.KeycloakSessionUtil; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Disposes; +import io.quarkus.arc.Unremovable; @ApplicationScoped @Unremovable diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/CloseSessionFilter.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/CloseSessionFilter.java index 843483b4ba0..d74a89affa9 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/CloseSessionFilter.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/CloseSessionFilter.java @@ -20,6 +20,7 @@ package org.keycloak.quarkus.runtime.integration.jaxrs; import java.io.IOException; import java.io.OutputStream; import java.util.stream.Stream; + import jakarta.annotation.Priority; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.container.ContainerRequestContext; @@ -28,6 +29,7 @@ import jakarta.ws.rs.container.ContainerResponseFilter; import jakarta.ws.rs.container.PreMatching; import jakarta.ws.rs.core.StreamingOutput; import jakarta.ws.rs.ext.Provider; + import org.keycloak.utils.KeycloakSessionUtil; @Provider diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusKeycloakApplication.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusKeycloakApplication.java index dff9f7e2a07..9f28dc1869f 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusKeycloakApplication.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusKeycloakApplication.java @@ -17,6 +17,9 @@ package org.keycloak.quarkus.runtime.integration.jaxrs; +import jakarta.enterprise.event.Observes; +import jakarta.ws.rs.ApplicationPath; + import org.keycloak.config.BootstrapAdminOptions; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; @@ -34,8 +37,6 @@ import org.keycloak.utils.StringUtil; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; import io.smallrye.common.annotation.Blocking; -import jakarta.enterprise.event.Observes; -import jakarta.ws.rs.ApplicationPath; @ApplicationPath("/") @Blocking diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusObjectMapperResolver.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusObjectMapperResolver.java index 00e23bd7345..94e90d96720 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusObjectMapperResolver.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/jaxrs/QuarkusObjectMapperResolver.java @@ -20,7 +20,9 @@ package org.keycloak.quarkus.runtime.integration.jaxrs; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; import jakarta.ws.rs.ext.Provider; + import org.keycloak.services.util.ObjectMapperResolver; + import com.fasterxml.jackson.databind.ObjectMapper; @Provider diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/KeycloakHandlerChainCustomizer.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/KeycloakHandlerChainCustomizer.java index c2160c3b524..ad13b79e020 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/KeycloakHandlerChainCustomizer.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/KeycloakHandlerChainCustomizer.java @@ -17,19 +17,20 @@ package org.keycloak.quarkus.runtime.integration.resteasy; -import static jakarta.ws.rs.HttpMethod.PATCH; -import static jakarta.ws.rs.HttpMethod.POST; -import static jakarta.ws.rs.HttpMethod.PUT; - import java.util.ArrayList; import java.util.List; import java.util.Set; + import org.jboss.resteasy.reactive.common.model.ResourceClass; import org.jboss.resteasy.reactive.server.handlers.FormBodyHandler; import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer; import org.jboss.resteasy.reactive.server.model.ServerResourceMethod; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; +import static jakarta.ws.rs.HttpMethod.PATCH; +import static jakarta.ws.rs.HttpMethod.POST; +import static jakarta.ws.rs.HttpMethod.PUT; + public final class KeycloakHandlerChainCustomizer implements HandlerChainCustomizer { private final TransactionalSessionHandler TRANSACTIONAL_SESSION_HANDLER = new TransactionalSessionHandler(); diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/KeycloakTracingCustomizer.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/KeycloakTracingCustomizer.java index 645b685d5db..6f005191a5d 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/KeycloakTracingCustomizer.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/KeycloakTracingCustomizer.java @@ -17,6 +17,13 @@ package org.keycloak.quarkus.runtime.integration.resteasy; +import java.util.ArrayList; +import java.util.List; + +import jakarta.enterprise.inject.spi.CDI; + +import org.keycloak.common.Version; + import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanBuilder; @@ -24,17 +31,12 @@ import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.semconv.incubating.CodeIncubatingAttributes; -import jakarta.enterprise.inject.spi.CDI; import org.apache.commons.lang3.StringUtils; import org.jboss.resteasy.reactive.common.model.ResourceClass; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.model.HandlerChainCustomizer; import org.jboss.resteasy.reactive.server.model.ServerResourceMethod; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; -import org.keycloak.common.Version; - -import java.util.ArrayList; -import java.util.List; public final class KeycloakTracingCustomizer implements HandlerChainCustomizer { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusHttpRequest.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusHttpRequest.java index a4774b0688d..a57f345bbc6 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusHttpRequest.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusHttpRequest.java @@ -21,19 +21,15 @@ import java.io.IOException; import java.security.cert.X509Certificate; import java.util.Deque; import java.util.Iterator; +import javax.net.ssl.SSLPeerUnverifiedException; +import javax.net.ssl.SSLSession; import jakarta.enterprise.inject.Instance; import jakarta.enterprise.inject.spi.CDI; -import javax.net.ssl.SSLPeerUnverifiedException; -import javax.net.ssl.SSLSession; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.UriInfo; -import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap; -import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; -import org.jboss.resteasy.reactive.server.core.multipart.FormData; -import org.jboss.resteasy.reactive.server.multipart.FormValue; import org.keycloak.config.ProxyOptions; import org.keycloak.http.FormPartValue; import org.keycloak.http.HttpRequest; @@ -42,6 +38,10 @@ import org.keycloak.quarkus.runtime.integration.jaxrs.EmptyMultivaluedMap; import org.keycloak.services.FormPartValueImpl; import io.vertx.ext.web.RoutingContext; +import org.jboss.resteasy.reactive.common.util.QuarkusMultivaluedHashMap; +import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; +import org.jboss.resteasy.reactive.server.core.multipart.FormData; +import org.jboss.resteasy.reactive.server.multipart.FormValue; public final class QuarkusHttpRequest implements HttpRequest { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusHttpResponse.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusHttpResponse.java index 7216f399221..2ad62c51e69 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusHttpResponse.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusHttpResponse.java @@ -17,15 +17,17 @@ package org.keycloak.quarkus.runtime.integration.resteasy; +import java.util.HashSet; +import java.util.Set; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.NewCookie; import jakarta.ws.rs.ext.RuntimeDelegate; -import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; -import org.jboss.resteasy.reactive.server.vertx.VertxResteasyReactiveRequestContext; + import org.keycloak.http.HttpResponse; -import java.util.HashSet; -import java.util.Set; +import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; +import org.jboss.resteasy.reactive.server.vertx.VertxResteasyReactiveRequestContext; public final class QuarkusHttpResponse implements HttpResponse { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusKeycloakContext.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusKeycloakContext.java index 81dce23c52e..fc8324a0ce5 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusKeycloakContext.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/QuarkusKeycloakContext.java @@ -17,15 +17,16 @@ package org.keycloak.quarkus.runtime.integration.resteasy; -import io.vertx.core.http.HttpServerRequest; -import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; -import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.keycloak.common.ClientConnection; import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; import org.keycloak.models.KeycloakSession; import org.keycloak.services.DefaultKeycloakContext; +import io.vertx.core.http.HttpServerRequest; +import org.jboss.resteasy.reactive.server.core.CurrentRequestManager; +import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; + public final class QuarkusKeycloakContext extends DefaultKeycloakContext { public QuarkusKeycloakContext(KeycloakSession session) { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/SetResponseContentTypeHandler.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/SetResponseContentTypeHandler.java index 312db5433d0..5ab8c155e9d 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/SetResponseContentTypeHandler.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/SetResponseContentTypeHandler.java @@ -18,6 +18,7 @@ package org.keycloak.quarkus.runtime.integration.resteasy; import jakarta.ws.rs.core.MediaType; + import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/TransactionalSessionHandler.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/TransactionalSessionHandler.java index b2cce707895..22c8383e159 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/TransactionalSessionHandler.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/resteasy/TransactionalSessionHandler.java @@ -17,13 +17,13 @@ package org.keycloak.quarkus.runtime.integration.resteasy; -import io.quarkus.arc.Arc; - -import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; -import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; import org.keycloak.models.KeycloakSession; import org.keycloak.utils.KeycloakSessionUtil; +import io.quarkus.arc.Arc; +import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; +import org.jboss.resteasy.reactive.server.spi.ServerRestHandler; + public final class TransactionalSessionHandler implements ServerRestHandler, org.keycloak.quarkus.runtime.transaction.TransactionalSessionHandler { @Override diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/web/VertxClientCertificateLookup.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/web/VertxClientCertificateLookup.java index bb02928e983..d279fc22787 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/web/VertxClientCertificateLookup.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/integration/web/VertxClientCertificateLookup.java @@ -19,10 +19,11 @@ package org.keycloak.quarkus.runtime.integration.web; import java.security.cert.X509Certificate; -import org.jboss.logging.Logger; import org.keycloak.http.HttpRequest; import org.keycloak.services.x509.X509ClientCertificateLookup; +import org.jboss.logging.Logger; + /** * @author Pedro Igor */ diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/logging/ClearMappedDiagnosticContextFilter.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/logging/ClearMappedDiagnosticContextFilter.java index c56ee8cb263..0438d438c7f 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/logging/ClearMappedDiagnosticContextFilter.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/logging/ClearMappedDiagnosticContextFilter.java @@ -1,13 +1,14 @@ package org.keycloak.quarkus.runtime.logging; +import java.io.IOException; + import jakarta.annotation.Priority; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.container.ContainerResponseContext; import jakarta.ws.rs.container.ContainerResponseFilter; import jakarta.ws.rs.ext.Provider; -import org.keycloak.logging.MappedDiagnosticContextUtil; -import java.io.IOException; +import org.keycloak.logging.MappedDiagnosticContextUtil; /** * Response filter that clears custom properties from MDC. diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/logging/KeycloakLogFilter.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/logging/KeycloakLogFilter.java index da106fe846b..234a436423b 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/logging/KeycloakLogFilter.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/logging/KeycloakLogFilter.java @@ -17,16 +17,17 @@ package org.keycloak.quarkus.runtime.logging; -import io.quarkus.logging.LoggingFilter; -import org.keycloak.connections.infinispan.InfinispanConnectionProvider; -import org.keycloak.common.util.MultiSiteUtils; - import java.util.Objects; import java.util.logging.Filter; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.regex.Pattern; +import org.keycloak.common.util.MultiSiteUtils; +import org.keycloak.connections.infinispan.InfinispanConnectionProvider; + +import io.quarkus.logging.LoggingFilter; + /** * @author Alexander Schwartz */ diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/oas/OASModelFilter.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/oas/OASModelFilter.java index 04aadb10e98..7f928164f1a 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/oas/OASModelFilter.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/oas/OASModelFilter.java @@ -1,12 +1,5 @@ package org.keycloak.quarkus.runtime.oas; -import io.quarkus.smallrye.openapi.OpenApiFilter; -import org.eclipse.microprofile.openapi.OASFactory; -import org.eclipse.microprofile.openapi.OASFilter; -import org.eclipse.microprofile.openapi.models.OpenAPI; -import org.eclipse.microprofile.openapi.models.Operation; -import org.eclipse.microprofile.openapi.models.PathItem; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -14,6 +7,13 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import io.quarkus.smallrye.openapi.OpenApiFilter; +import org.eclipse.microprofile.openapi.OASFactory; +import org.eclipse.microprofile.openapi.OASFilter; +import org.eclipse.microprofile.openapi.models.OpenAPI; +import org.eclipse.microprofile.openapi.models.Operation; +import org.eclipse.microprofile.openapi.models.PathItem; + @OpenApiFilter(OpenApiFilter.RunStage.BUILD) public class OASModelFilter implements OASFilter { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/policy/QuarkusBlacklistPasswordPolicyProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/policy/QuarkusBlacklistPasswordPolicyProviderFactory.java index 03df08789e7..587e5589cd8 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/policy/QuarkusBlacklistPasswordPolicyProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/policy/QuarkusBlacklistPasswordPolicyProviderFactory.java @@ -17,11 +17,11 @@ package org.keycloak.quarkus.runtime.policy; +import java.io.File; + import org.keycloak.policy.BlacklistPasswordPolicyProviderFactory; import org.keycloak.quarkus.runtime.Environment; -import java.io.File; - /** *

Quarkus implementation of the BlacklistPasswordPolicyProviderFactory. The * default path for the list files is calculated using the quarkus environment diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/RejectNonNormalizedPathFilter.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/RejectNonNormalizedPathFilter.java index 8a4cf2b7419..fbd23ebfffb 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/RejectNonNormalizedPathFilter.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/RejectNonNormalizedPathFilter.java @@ -17,15 +17,16 @@ package org.keycloak.quarkus.runtime.services; +import java.util.Objects; + +import org.keycloak.representations.idm.OAuth2ErrorRepresentation; +import org.keycloak.services.util.ObjectMapperResolver; + import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.vertx.core.Handler; import io.vertx.ext.web.RoutingContext; import org.jboss.logging.Logger; -import org.keycloak.representations.idm.OAuth2ErrorRepresentation; -import org.keycloak.services.util.ObjectMapperResolver; - -import java.util.Objects; /** * This filter rejects all paths that need normalization as of RFC3986 or that have double slashes. diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakClusterReadyHealthCheck.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakClusterReadyHealthCheck.java index bbb85b278d1..adfbf8635a5 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakClusterReadyHealthCheck.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakClusterReadyHealthCheck.java @@ -19,14 +19,15 @@ package org.keycloak.quarkus.runtime.services.health; import java.time.Instant; import java.util.concurrent.atomic.AtomicReference; -import io.smallrye.health.api.AsyncHealthCheck; -import io.smallrye.mutiny.Uni; -import org.eclipse.microprofile.health.HealthCheckResponse; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.connections.infinispan.InfinispanConnectionProviderFactory; import org.keycloak.infinispan.util.InfinispanUtils; import org.keycloak.quarkus.runtime.integration.QuarkusKeycloakSessionFactory; +import io.smallrye.health.api.AsyncHealthCheck; +import io.smallrye.mutiny.Uni; +import org.eclipse.microprofile.health.HealthCheckResponse; + import static org.keycloak.quarkus.runtime.services.health.KeycloakReadyHealthCheck.DATE_FORMATTER; import static org.keycloak.quarkus.runtime.services.health.KeycloakReadyHealthCheck.FAILING_SINCE; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakClusterReadyHealthCheckProducer.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakClusterReadyHealthCheckProducer.java index ecc9586c382..926797d3422 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakClusterReadyHealthCheckProducer.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakClusterReadyHealthCheckProducer.java @@ -16,15 +16,17 @@ */ package org.keycloak.quarkus.runtime.services.health; -import io.smallrye.health.api.AsyncHealthCheck; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Produces; -import org.eclipse.microprofile.health.Readiness; + import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.connections.infinispan.InfinispanConnectionProviderFactory; import org.keycloak.quarkus.runtime.integration.QuarkusKeycloakSessionFactory; +import io.smallrye.health.api.AsyncHealthCheck; +import org.eclipse.microprofile.health.Readiness; + @ApplicationScoped public class KeycloakClusterReadyHealthCheckProducer { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakReadyHealthCheck.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakReadyHealthCheck.java index da0d6682095..690cedf79de 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakReadyHealthCheck.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/health/KeycloakReadyHealthCheck.java @@ -16,24 +16,25 @@ */ package org.keycloak.quarkus.runtime.services.health; +import java.time.Instant; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; + +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; + import io.agroal.api.AgroalDataSource; import io.agroal.api.AgroalDataSourceMetrics; import io.quarkus.agroal.runtime.health.DataSourceHealthCheck; import io.quarkus.smallrye.health.runtime.QuarkusAsyncHealthCheckFactory; import io.smallrye.health.api.AsyncHealthCheck; import io.smallrye.mutiny.Uni; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.inject.Inject; import org.eclipse.microprofile.health.HealthCheckResponse; import org.eclipse.microprofile.health.HealthCheckResponseBuilder; import org.eclipse.microprofile.health.Readiness; -import java.time.Instant; -import java.time.ZoneId; -import java.time.format.DateTimeFormatter; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicReference; - /** * Keycloak Healthcheck Readiness Probe. *

diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/HistogramMeterFilter.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/HistogramMeterFilter.java index 8e409bea549..8650ac07af7 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/HistogramMeterFilter.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/HistogramMeterFilter.java @@ -17,17 +17,19 @@ package org.keycloak.quarkus.runtime.services.metrics; -import io.micrometer.core.instrument.Meter; -import io.micrometer.core.instrument.config.MeterFilter; -import io.micrometer.core.instrument.distribution.DistributionStatisticConfig; -import jakarta.inject.Singleton; -import org.keycloak.config.HttpOptions; -import org.keycloak.quarkus.runtime.configuration.Configuration; - import java.util.Arrays; import java.util.Optional; import java.util.concurrent.TimeUnit; +import jakarta.inject.Singleton; + +import org.keycloak.config.HttpOptions; +import org.keycloak.quarkus.runtime.configuration.Configuration; + +import io.micrometer.core.instrument.Meter; +import io.micrometer.core.instrument.config.MeterFilter; +import io.micrometer.core.instrument.distribution.DistributionStatisticConfig; + /** * @author Alexander Schwartz */ diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/events/MicrometerUserEventMetricsEventListenerProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/events/MicrometerUserEventMetricsEventListenerProvider.java index 3c51dbe47f5..983e8c37742 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/events/MicrometerUserEventMetricsEventListenerProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/events/MicrometerUserEventMetricsEventListenerProvider.java @@ -17,10 +17,11 @@ package org.keycloak.quarkus.runtime.services.metrics.events; -import io.micrometer.core.instrument.Counter; -import io.micrometer.core.instrument.Meter; -import io.micrometer.core.instrument.Tag; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; + import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.Event; @@ -30,10 +31,10 @@ import org.keycloak.events.EventType; import org.keycloak.events.admin.AdminEvent; import org.keycloak.models.KeycloakSession; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Locale; +import io.micrometer.core.instrument.Counter; +import io.micrometer.core.instrument.Meter; +import io.micrometer.core.instrument.Tag; +import org.jboss.logging.Logger; public class MicrometerUserEventMetricsEventListenerProvider implements EventListenerProvider { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/events/MicrometerUserEventMetricsEventListenerProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/events/MicrometerUserEventMetricsEventListenerProviderFactory.java index 1d50222837f..6637701931b 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/events/MicrometerUserEventMetricsEventListenerProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/metrics/events/MicrometerUserEventMetricsEventListenerProviderFactory.java @@ -17,11 +17,8 @@ package org.keycloak.quarkus.runtime.services.metrics.events; -import io.micrometer.core.instrument.Counter; -import io.micrometer.core.instrument.Meter; -import io.micrometer.core.instrument.Metrics; -import io.micrometer.core.instrument.binder.BaseUnits; -import org.bouncycastle.util.Strings; +import java.util.HashSet; + import org.keycloak.Config; import org.keycloak.events.EventListenerProvider; import org.keycloak.events.EventListenerProviderFactory; @@ -29,7 +26,11 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.EnvironmentDependentProviderFactory; -import java.util.HashSet; +import io.micrometer.core.instrument.Counter; +import io.micrometer.core.instrument.Meter; +import io.micrometer.core.instrument.Metrics; +import io.micrometer.core.instrument.binder.BaseUnits; +import org.bouncycastle.util.Strings; public class MicrometerUserEventMetricsEventListenerProviderFactory implements EventListenerProviderFactory, EnvironmentDependentProviderFactory { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/resources/DebugHostnameSettingsResource.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/resources/DebugHostnameSettingsResource.java index 01b9ea6e8cf..d78abc16e1a 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/resources/DebugHostnameSettingsResource.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/services/resources/DebugHostnameSettingsResource.java @@ -27,6 +27,19 @@ import java.util.Objects; import java.util.TreeMap; import java.util.stream.Stream; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; + import org.keycloak.common.util.UriUtils; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -42,18 +55,6 @@ import org.keycloak.urls.UrlType; import org.keycloak.utils.SecureContextResolver; import io.quarkus.resteasy.reactive.server.EndpointDisabled; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Context; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.ext.Provider; @Provider @Path("/realms") diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/AbstractJpaConnectionProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/AbstractJpaConnectionProviderFactory.java index 8de5af141d3..ee745dac6e4 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/AbstractJpaConnectionProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/AbstractJpaConnectionProviderFactory.java @@ -21,12 +21,13 @@ import java.lang.annotation.Annotation; import java.sql.Connection; import java.sql.SQLException; import java.util.Optional; + import jakarta.enterprise.inject.Instance; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.FlushModeType; import jakarta.persistence.SynchronizationType; -import org.hibernate.internal.SessionFactoryImpl; + import org.keycloak.Config; import org.keycloak.config.DatabaseOptions; import org.keycloak.connections.jpa.DefaultJpaConnectionProvider; @@ -40,6 +41,7 @@ import org.keycloak.quarkus.runtime.configuration.Configuration; import io.quarkus.arc.Arc; import io.quarkus.hibernate.orm.PersistenceUnit; import liquibase.GlobalConfiguration; +import org.hibernate.internal.SessionFactoryImpl; import org.jboss.logging.Logger; public abstract class AbstractJpaConnectionProviderFactory implements JpaConnectionProviderFactory { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/NamedJpaConnectionProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/NamedJpaConnectionProviderFactory.java index be111ffb848..e345090637b 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/NamedJpaConnectionProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/NamedJpaConnectionProviderFactory.java @@ -18,6 +18,7 @@ package org.keycloak.quarkus.runtime.storage.database.jpa; import java.util.function.Supplier; + import jakarta.persistence.EntityManagerFactory; public final class NamedJpaConnectionProviderFactory extends AbstractJpaConnectionProviderFactory { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/QuarkusJpaConnectionProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/QuarkusJpaConnectionProviderFactory.java index 723c4730680..5c124531231 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/QuarkusJpaConnectionProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/jpa/QuarkusJpaConnectionProviderFactory.java @@ -17,10 +17,6 @@ package org.keycloak.quarkus.runtime.storage.database.jpa; -import static org.keycloak.connections.jpa.util.JpaUtils.configureNamedQuery; -import static org.keycloak.quarkus.runtime.storage.database.liquibase.QuarkusJpaUpdaterProvider.VERIFY_AND_RUN_MASTER_CHANGELOG; -import static org.keycloak.models.utils.KeycloakModelUtils.runJobInTransaction; - import java.io.File; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -31,14 +27,10 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import io.quarkus.runtime.configuration.DurationConverter; import jakarta.enterprise.inject.Instance; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; -import io.quarkus.arc.Arc; - -import org.jboss.logging.Logger; import org.keycloak.ServerStartupError; import org.keycloak.common.Version; import org.keycloak.config.DatabaseOptions; @@ -57,6 +49,14 @@ import org.keycloak.provider.ServerInfoAwareProviderFactory; import org.keycloak.quarkus.runtime.Environment; import org.keycloak.quarkus.runtime.configuration.Configuration; +import io.quarkus.arc.Arc; +import io.quarkus.runtime.configuration.DurationConverter; +import org.jboss.logging.Logger; + +import static org.keycloak.connections.jpa.util.JpaUtils.configureNamedQuery; +import static org.keycloak.models.utils.KeycloakModelUtils.runJobInTransaction; +import static org.keycloak.quarkus.runtime.storage.database.liquibase.QuarkusJpaUpdaterProvider.VERIFY_AND_RUN_MASTER_CHANGELOG; + /** * @author Stian Thorgersen */ diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProvider.java index 390201f3bd2..65494141e0b 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusJpaUpdaterProvider.java @@ -28,8 +28,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import liquibase.Scope; -import org.jboss.logging.Logger; import org.keycloak.connections.jpa.entityprovider.JpaEntityProvider; import org.keycloak.connections.jpa.updater.JpaUpdaterProvider; import org.keycloak.connections.jpa.updater.liquibase.LiquibaseConstants; @@ -43,6 +41,7 @@ import org.keycloak.models.KeycloakSession; import liquibase.Contexts; import liquibase.LabelExpression; import liquibase.Liquibase; +import liquibase.Scope; import liquibase.changelog.ChangeLogHistoryService; import liquibase.changelog.ChangeLogHistoryServiceFactory; import liquibase.changelog.ChangeSet; @@ -62,6 +61,7 @@ import liquibase.statement.core.UpdateStatement; import liquibase.structure.core.Column; import liquibase.structure.core.Table; import liquibase.util.StreamUtil; +import org.jboss.logging.Logger; public class QuarkusJpaUpdaterProvider implements JpaUpdaterProvider { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusLiquibaseConnectionProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusLiquibaseConnectionProvider.java index a6e1607ea36..22f74f081a5 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusLiquibaseConnectionProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/storage/database/liquibase/QuarkusLiquibaseConnectionProvider.java @@ -21,13 +21,15 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; import javax.xml.parsers.SAXParserFactory; + +import org.keycloak.connections.jpa.updater.liquibase.conn.DefaultLiquibaseConnectionProvider; + import liquibase.Scope; import liquibase.parser.ChangeLogParser; import liquibase.parser.ChangeLogParserFactory; import liquibase.parser.core.xml.XMLChangeLogSAXParser; import liquibase.ui.LoggerUIService; import org.jboss.logging.Logger; -import org.keycloak.connections.jpa.updater.liquibase.conn.DefaultLiquibaseConnectionProvider; public class QuarkusLiquibaseConnectionProvider extends DefaultLiquibaseConnectionProvider { diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/FlatClasspathThemeResourceProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/FlatClasspathThemeResourceProviderFactory.java index 960b0992449..35a00b3e69e 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/FlatClasspathThemeResourceProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/FlatClasspathThemeResourceProviderFactory.java @@ -17,14 +17,14 @@ package org.keycloak.quarkus.runtime.themes; -import org.keycloak.theme.ClasspathThemeResourceProviderFactory; - import java.io.IOException; import java.net.URL; import java.util.Enumeration; import java.util.Locale; import java.util.Properties; +import org.keycloak.theme.ClasspathThemeResourceProviderFactory; + public class FlatClasspathThemeResourceProviderFactory extends ClasspathThemeResourceProviderFactory { public static final String ID = "flat-classpath"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/QuarkusFolderThemeProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/QuarkusFolderThemeProviderFactory.java index 1465cbe309f..17eabc97858 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/QuarkusFolderThemeProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/QuarkusFolderThemeProviderFactory.java @@ -1,5 +1,8 @@ package org.keycloak.quarkus.runtime.themes; +import java.io.File; +import java.util.Optional; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; @@ -8,9 +11,6 @@ import org.keycloak.theme.FolderThemeProvider; import org.keycloak.theme.ThemeProvider; import org.keycloak.theme.ThemeProviderFactory; -import java.io.File; -import java.util.Optional; - public class QuarkusFolderThemeProviderFactory implements ThemeProviderFactory { private static final String CONFIG_DIR_KEY = "dir"; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/QuarkusJarThemeProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/QuarkusJarThemeProviderFactory.java index 9dbcc8af1a5..5f02426ff43 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/QuarkusJarThemeProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/themes/QuarkusJarThemeProviderFactory.java @@ -18,6 +18,7 @@ package org.keycloak.quarkus.runtime.themes; import java.util.List; + import org.keycloak.Config; import org.keycloak.theme.JarThemeProviderFactory; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientBuilder.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientBuilder.java index c3c90e994e5..5139b8cc59d 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientBuilder.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientBuilder.java @@ -17,9 +17,10 @@ package org.keycloak.quarkus.runtime.tracing; -import io.opentelemetry.instrumentation.apachehttpclient.v4_3.ApacheHttpClientTelemetry; import org.keycloak.connections.httpclient.HttpClientBuilder; +import io.opentelemetry.instrumentation.apachehttpclient.v4_3.ApacheHttpClientTelemetry; + /** * Get Apache HTTP client which is instrumented and used for tracing */ diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientFactory.java index 05201a1bed7..f25ec71a513 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelHttpClientFactory.java @@ -17,6 +17,8 @@ package org.keycloak.quarkus.runtime.tracing; +import java.util.Set; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.config.TracingOptions; @@ -30,8 +32,6 @@ import org.keycloak.provider.Provider; import org.keycloak.quarkus.runtime.configuration.Configuration; import org.keycloak.tracing.TracingProvider; -import java.util.Set; - /** * The traced {@link HttpClientFactory} for {@link HttpClientProvider HttpClientProvider's} used by Keycloak for outbound HTTP calls which are traced. */ diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelTracingProvider.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelTracingProvider.java index 7ef2bdb5892..f48e730c725 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelTracingProvider.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelTracingProvider.java @@ -17,6 +17,13 @@ package org.keycloak.quarkus.runtime.tracing; +import java.util.Deque; +import java.util.concurrent.ConcurrentLinkedDeque; +import java.util.function.Consumer; +import java.util.function.Function; + +import org.keycloak.tracing.TracingProvider; + import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; @@ -29,12 +36,6 @@ import io.opentelemetry.sdk.trace.ReadableSpan; import io.opentelemetry.semconv.ExceptionAttributes; import org.apache.commons.lang3.exception.ExceptionUtils; import org.jboss.logging.Logger; -import org.keycloak.tracing.TracingProvider; - -import java.util.Deque; -import java.util.concurrent.ConcurrentLinkedDeque; -import java.util.function.Consumer; -import java.util.function.Function; /** * Tracing provider leverages OpenTelemetry Tracing diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelTracingProviderFactory.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelTracingProviderFactory.java index 42c1543b4a7..c23fbe36286 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelTracingProviderFactory.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/tracing/OTelTracingProviderFactory.java @@ -17,8 +17,8 @@ package org.keycloak.quarkus.runtime.tracing; -import io.opentelemetry.api.OpenTelemetry; import jakarta.enterprise.inject.spi.CDI; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.config.TracingOptions; @@ -28,6 +28,8 @@ import org.keycloak.quarkus.runtime.configuration.Configuration; import org.keycloak.tracing.TracingProvider; import org.keycloak.tracing.TracingProviderFactory; +import io.opentelemetry.api.OpenTelemetry; + public class OTelTracingProviderFactory implements TracingProviderFactory { public static final String PROVIDER_ID = "opentelemetry"; private static OpenTelemetry OTEL_SINGLETON; diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/transaction/QuarkusJtaTransactionManagerLookup.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/transaction/QuarkusJtaTransactionManagerLookup.java index 61c7627b131..0cba8cb1edd 100644 --- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/transaction/QuarkusJtaTransactionManagerLookup.java +++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/transaction/QuarkusJtaTransactionManagerLookup.java @@ -19,11 +19,13 @@ package org.keycloak.quarkus.runtime.transaction; import jakarta.enterprise.inject.spi.CDI; import jakarta.transaction.TransactionManager; -import org.jboss.logging.Logger; + import org.keycloak.Config; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.transaction.JtaTransactionManagerLookup; +import org.jboss.logging.Logger; + public class QuarkusJtaTransactionManagerLookup implements JtaTransactionManagerLookup { private static final Logger logger = Logger.getLogger(QuarkusJtaTransactionManagerLookup.class); diff --git a/quarkus/runtime/src/test/java/org/keycloak/config/EventOptionsTest.java b/quarkus/runtime/src/test/java/org/keycloak/config/EventOptionsTest.java index bdff9ebf6bf..5c3574abfe9 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/config/EventOptionsTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/config/EventOptionsTest.java @@ -17,12 +17,13 @@ package org.keycloak.config; -import org.junit.Test; -import org.keycloak.events.EventType; - import java.util.ArrayList; import java.util.List; +import org.keycloak.events.EventType; + +import org.junit.Test; + import static org.junit.Assert.fail; public class EventOptionsTest { diff --git a/quarkus/runtime/src/test/java/org/keycloak/config/OptionBuilderTest.java b/quarkus/runtime/src/test/java/org/keycloak/config/OptionBuilderTest.java index c086a6a605f..cf09b5df398 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/config/OptionBuilderTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/config/OptionBuilderTest.java @@ -17,10 +17,10 @@ package org.keycloak.config; -import static org.junit.Assert.assertArrayEquals; - import org.junit.Test; +import static org.junit.Assert.assertArrayEquals; + public class OptionBuilderTest { @Test diff --git a/quarkus/runtime/src/test/java/org/keycloak/config/WildcardOptionsUtilTest.java b/quarkus/runtime/src/test/java/org/keycloak/config/WildcardOptionsUtilTest.java index 3ca6a21e247..6c621ac2a6b 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/config/WildcardOptionsUtilTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/config/WildcardOptionsUtilTest.java @@ -2,14 +2,15 @@ package org.keycloak.config; import org.junit.Test; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNull; import static org.keycloak.config.WildcardOptionsUtil.getWildcardNamedKey; import static org.keycloak.config.WildcardOptionsUtil.getWildcardPrefix; import static org.keycloak.config.WildcardOptionsUtil.getWildcardValue; -import static org.hamcrest.CoreMatchers.is; import static org.keycloak.config.WildcardOptionsUtil.isWildcardOption; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNull; + public class WildcardOptionsUtilTest { @Test diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/cli/PicocliTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/cli/PicocliTest.java index 0f56927e2b1..88df11d2e10 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/cli/PicocliTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/cli/PicocliTest.java @@ -17,16 +17,6 @@ package org.keycloak.quarkus.runtime.cli; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; @@ -39,24 +29,34 @@ import java.util.Properties; import java.util.function.Consumer; import java.util.stream.Stream; -import org.apache.commons.io.FileUtils; -import org.junit.Ignore; -import org.junit.Test; import org.keycloak.common.Profile; import org.keycloak.config.LoggingOptions; import org.keycloak.quarkus.runtime.Environment; import org.keycloak.quarkus.runtime.KeycloakMain; -import org.keycloak.quarkus.runtime.cli.command.AbstractCommand; import org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand; +import org.keycloak.quarkus.runtime.cli.command.AbstractCommand; import org.keycloak.quarkus.runtime.configuration.AbstractConfigurationTest; import org.keycloak.quarkus.runtime.configuration.Configuration; import org.keycloak.quarkus.runtime.configuration.KeycloakConfigSourceProvider; import org.keycloak.quarkus.runtime.configuration.PersistedConfigSource; import io.smallrye.config.SmallRyeConfig; +import org.apache.commons.io.FileUtils; +import org.junit.Ignore; +import org.junit.Test; import picocli.CommandLine; import picocli.CommandLine.Help; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class PicocliTest extends AbstractConfigurationTest { // TODO: could utilize CLIResult diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/AbstractConfigurationTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/AbstractConfigurationTest.java index 6fc1e15b0a3..d6d193a68e8 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/AbstractConfigurationTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/AbstractConfigurationTest.java @@ -17,20 +17,11 @@ package org.keycloak.quarkus.runtime.configuration; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.nio.file.Paths; import java.util.Map; import java.util.Properties; import java.util.function.Function; -import org.junit.After; -import org.junit.BeforeClass; import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.quarkus.runtime.Environment; @@ -40,6 +31,15 @@ import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; import io.smallrye.config.ConfigValue; import io.smallrye.config.ConfigValue.ConfigValueBuilder; import io.smallrye.config.SmallRyeConfig; +import org.junit.After; +import org.junit.BeforeClass; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public abstract class AbstractConfigurationTest { diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSourceTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSourceTest.java index cc79ae5480c..3d2e0a71c7b 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSourceTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigArgsConfigSourceTest.java @@ -17,12 +17,12 @@ package org.keycloak.quarkus.runtime.configuration; -import org.junit.Test; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.junit.Test; + import static org.junit.Assert.assertEquals; public class ConfigArgsConfigSourceTest { diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigurationTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigurationTest.java index 4ac80917f66..4896ba95fc4 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigurationTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ConfigurationTest.java @@ -17,11 +17,6 @@ package org.keycloak.quarkus.runtime.configuration; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.nio.file.FileSystems; import java.util.Arrays; @@ -32,28 +27,34 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; -import io.smallrye.config.SmallRyeConfig; -import org.hibernate.dialect.H2Dialect; -import org.hibernate.dialect.PostgreSQLDialect; -import io.smallrye.config.ConfigValue; -import io.smallrye.config.Expressions; -import io.smallrye.config.PropertiesConfigSource; -import io.smallrye.config.SmallRyeConfigBuilder; -import org.h2.Driver; -import org.hibernate.dialect.MariaDBDialect; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.Config; import org.keycloak.config.CachingOptions; -import org.keycloak.quarkus.runtime.configuration.mappers.HttpPropertyMappers; import org.keycloak.quarkus.runtime.Environment; +import org.keycloak.quarkus.runtime.configuration.mappers.HttpPropertyMappers; import org.keycloak.quarkus.runtime.vault.FilesKeystoreVaultProviderFactory; import org.keycloak.quarkus.runtime.vault.FilesPlainTextVaultProviderFactory; import org.keycloak.spi.infinispan.CacheEmbeddedConfigProviderSpi; import org.keycloak.spi.infinispan.impl.embedded.DefaultCacheEmbeddedConfigProviderFactory; + +import io.smallrye.config.ConfigValue; +import io.smallrye.config.Expressions; +import io.smallrye.config.PropertiesConfigSource; +import io.smallrye.config.SmallRyeConfig; +import io.smallrye.config.SmallRyeConfigBuilder; +import org.h2.Driver; +import org.hibernate.dialect.H2Dialect; +import org.hibernate.dialect.MariaDBDialect; +import org.hibernate.dialect.PostgreSQLDialect; +import org.junit.Assert; +import org.junit.Test; import org.mariadb.jdbc.MariaDbDataSource; import org.postgresql.xa.PGXADataSource; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class ConfigurationTest extends AbstractConfigurationTest { @Test diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/DatasourcesConfigurationTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/DatasourcesConfigurationTest.java index f3d83be087d..12bd599dce9 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/DatasourcesConfigurationTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/DatasourcesConfigurationTest.java @@ -1,5 +1,12 @@ package org.keycloak.quarkus.runtime.configuration; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + +import org.keycloak.quarkus.runtime.Environment; + import io.smallrye.config.Expressions; import io.smallrye.config.SmallRyeConfig; import org.h2.jdbcx.JdbcDataSource; @@ -7,15 +14,9 @@ import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.MariaDBDialect; import org.hibernate.dialect.PostgreSQLDialect; import org.junit.Test; -import org.keycloak.quarkus.runtime.Environment; import org.mariadb.jdbc.MariaDbDataSource; import org.postgresql.xa.PGXADataSource; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; - import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.is; diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/FeaturePropertyMappersTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/FeaturePropertyMappersTest.java index 331b42dd5e7..443d57e5f9b 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/FeaturePropertyMappersTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/FeaturePropertyMappersTest.java @@ -17,11 +17,12 @@ package org.keycloak.quarkus.runtime.configuration; -import org.junit.Test; import org.keycloak.common.Profile.Feature; import org.keycloak.quarkus.runtime.cli.PropertyException; import org.keycloak.quarkus.runtime.configuration.mappers.FeaturePropertyMappers; +import org.junit.Test; + import static org.junit.Assert.assertThrows; public class FeaturePropertyMappersTest { diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/IgnoredArtifactsTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/IgnoredArtifactsTest.java index ac5999d60df..88cd650d552 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/IgnoredArtifactsTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/IgnoredArtifactsTest.java @@ -17,14 +17,6 @@ package org.keycloak.quarkus.runtime.configuration; -import org.junit.Test; -import org.keycloak.common.Profile; -import org.keycloak.common.profile.PropertiesProfileConfigResolver; -import org.keycloak.config.DatabaseOptions; -import org.keycloak.config.HealthOptions; -import org.keycloak.config.MetricsOptions; -import org.keycloak.config.Option; - import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -33,9 +25,15 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; +import org.keycloak.common.Profile; +import org.keycloak.common.profile.PropertiesProfileConfigResolver; +import org.keycloak.config.DatabaseOptions; +import org.keycloak.config.HealthOptions; +import org.keycloak.config.MetricsOptions; +import org.keycloak.config.Option; + +import org.junit.Test; + import static org.keycloak.quarkus.runtime.configuration.IgnoredArtifacts.JDBC_H2; import static org.keycloak.quarkus.runtime.configuration.IgnoredArtifacts.JDBC_MARIADB; import static org.keycloak.quarkus.runtime.configuration.IgnoredArtifacts.JDBC_MSSQL; @@ -44,6 +42,10 @@ import static org.keycloak.quarkus.runtime.configuration.IgnoredArtifacts.JDBC_O import static org.keycloak.quarkus.runtime.configuration.IgnoredArtifacts.JDBC_POSTGRES; import static org.keycloak.quarkus.runtime.configuration.MicroProfileConfigProvider.NS_KEYCLOAK_PREFIX; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertTrue; + public class IgnoredArtifactsTest extends AbstractConfigurationTest { @Test diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/LoggingConfigurationTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/LoggingConfigurationTest.java index bba803b10ef..929ba3c9f9b 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/LoggingConfigurationTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/LoggingConfigurationTest.java @@ -17,27 +17,29 @@ package org.keycloak.quarkus.runtime.configuration; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.StreamSupport; + +import org.keycloak.config.LoggingOptions; +import org.keycloak.quarkus.runtime.Environment; +import org.keycloak.quarkus.runtime.cli.PropertyException; + +import io.quarkus.runtime.logging.LogRuntimeConfig; +import io.smallrye.config.SmallRyeConfig; +import org.hamcrest.CoreMatchers; +import org.junit.Test; + +import static org.keycloak.config.LoggingOptions.DEFAULT_LOG_FORMAT; +import static org.keycloak.config.LoggingOptions.DEFAULT_SYSLOG_OUTPUT; + import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.config.LoggingOptions.DEFAULT_LOG_FORMAT; -import static org.keycloak.config.LoggingOptions.DEFAULT_SYSLOG_OUTPUT; - -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; - -import io.quarkus.runtime.logging.LogRuntimeConfig; -import org.hamcrest.CoreMatchers; -import org.junit.Test; -import org.keycloak.config.LoggingOptions; -import org.keycloak.quarkus.runtime.Environment; -import org.keycloak.quarkus.runtime.cli.PropertyException; -import io.smallrye.config.SmallRyeConfig; public class LoggingConfigurationTest extends AbstractConfigurationTest { diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ManagementConfigurationTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ManagementConfigurationTest.java index 22f4321b1a0..288e5e67304 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ManagementConfigurationTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/ManagementConfigurationTest.java @@ -16,12 +16,13 @@ */ package org.keycloak.quarkus.runtime.configuration; -import org.junit.Test; +import java.util.Map; + import org.keycloak.quarkus.runtime.cli.command.Build; import org.keycloak.quarkus.runtime.configuration.mappers.ManagementPropertyMappers; import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; -import java.util.Map; +import org.junit.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/TracingConfigurationTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/TracingConfigurationTest.java index 5fa8a600464..ec601cc24e7 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/TracingConfigurationTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/TracingConfigurationTest.java @@ -17,13 +17,14 @@ package org.keycloak.quarkus.runtime.configuration; -import io.quarkus.opentelemetry.runtime.config.build.SamplerType; -import org.junit.Test; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.config.LoggingOptions; import org.keycloak.config.TracingOptions; -import java.util.HashMap; -import java.util.Map; +import io.quarkus.opentelemetry.runtime.config.build.SamplerType; +import org.junit.Test; public class TracingConfigurationTest extends AbstractConfigurationTest { diff --git a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMappersTest.java b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMappersTest.java index ba1d753fe3c..b36cdf9c127 100644 --- a/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMappersTest.java +++ b/quarkus/runtime/src/test/java/org/keycloak/quarkus/runtime/configuration/mappers/PropertyMappersTest.java @@ -17,11 +17,11 @@ package org.keycloak.quarkus.runtime.configuration.mappers; +import org.junit.Test; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.junit.Test; - public class PropertyMappersTest { @Test diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/approvaltests/WindowsOrUnixOsEnvironmentLabeller.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/approvaltests/WindowsOrUnixOsEnvironmentLabeller.java index 391566eee96..e6c06f13854 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/approvaltests/WindowsOrUnixOsEnvironmentLabeller.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/approvaltests/WindowsOrUnixOsEnvironmentLabeller.java @@ -17,10 +17,10 @@ package org.keycloak.it.approvaltests; -import org.lambda.functions.Function0; - import java.util.Locale; +import org.lambda.functions.Function0; + public class WindowsOrUnixOsEnvironmentLabeller implements Function0 { private static final String WINDOWS_NAME = "windows"; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BootstrapAdminDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BootstrapAdminDistTest.java index b65cca723e7..5b9f5b2b549 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BootstrapAdminDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BootstrapAdminDistTest.java @@ -17,10 +17,6 @@ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import io.quarkus.test.junit.main.LaunchResult; - -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; @@ -28,6 +24,10 @@ import org.keycloak.it.junit5.extension.WithEnvVars; import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.RawKeycloakDistribution; +import io.quarkus.test.junit.main.Launch; +import io.quarkus.test.junit.main.LaunchResult; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BuildAndStartDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BuildAndStartDistTest.java index 5f008b94474..cdde270535a 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BuildAndStartDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BuildAndStartDistTest.java @@ -17,12 +17,6 @@ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import io.quarkus.test.junit.main.LaunchResult; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.DryRun; @@ -31,9 +25,17 @@ import org.keycloak.it.junit5.extension.WithEnvVars; import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.RawKeycloakDistribution; -import static org.junit.jupiter.api.Assertions.assertTrue; +import io.quarkus.test.junit.main.Launch; +import io.quarkus.test.junit.main.LaunchResult; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; + import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; +import static org.junit.jupiter.api.Assertions.assertTrue; + @WithEnvVars({"KC_CACHE", "local"}) // avoid flakey port conflicts @DistributionTest @RawDistOnly(reason = "Containers are immutable") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BuildCommandDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BuildCommandDistTest.java index 1c3f2e3bc33..a5a8a281f4d 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BuildCommandDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/BuildCommandDistTest.java @@ -17,23 +17,23 @@ package org.keycloak.it.cli.dist; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; -import static org.keycloak.quarkus.runtime.cli.command.Main.CONFIG_FILE_LONG_NAME; +import java.nio.file.Paths; -import org.junit.jupiter.api.Test; import org.keycloak.config.database.Database; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; - -import io.quarkus.test.junit.main.Launch; - import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.junit5.extension.WithEnvVars; import org.keycloak.it.utils.KeycloakDistribution; -import java.nio.file.Paths; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Test; + +import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; +import static org.keycloak.quarkus.runtime.cli.command.Main.CONFIG_FILE_LONG_NAME; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @DistributionTest class BuildCommandDistTest { diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CacheEmbeddedMtlsDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CacheEmbeddedMtlsDistTest.java index 9dc4a93e47e..15fcf808cdd 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CacheEmbeddedMtlsDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CacheEmbeddedMtlsDistTest.java @@ -21,7 +21,6 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; -import org.junit.jupiter.api.Test; import org.keycloak.config.CachingOptions; import org.keycloak.config.Option; import org.keycloak.it.junit5.extension.DistributionTest; @@ -29,6 +28,8 @@ import org.keycloak.it.junit5.extension.DryRun; import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.utils.KeycloakDistribution; +import org.junit.jupiter.api.Test; + @DistributionTest public class CacheEmbeddedMtlsDistTest { diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ClusterConfigDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ClusterConfigDistTest.java index 77a6a0cf662..ff51dac9330 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ClusterConfigDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ClusterConfigDistTest.java @@ -20,18 +20,18 @@ package org.keycloak.it.cli.dist; import java.nio.file.Path; import java.util.function.Consumer; +import org.keycloak.it.junit5.extension.BeforeStartDistribution; +import org.keycloak.it.junit5.extension.CLIResult; +import org.keycloak.it.junit5.extension.DistributionTest; +import org.keycloak.it.junit5.extension.RawDistOnly; +import org.keycloak.it.junit5.extension.Storage; +import org.keycloak.it.utils.KeycloakDistribution; + +import io.quarkus.test.junit.main.Launch; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.OS; -import org.keycloak.it.junit5.extension.BeforeStartDistribution; -import org.keycloak.it.junit5.extension.CLIResult; -import org.keycloak.it.junit5.extension.DistributionTest; -import org.keycloak.it.junit5.extension.Storage; -import org.keycloak.it.junit5.extension.RawDistOnly; -import org.keycloak.it.utils.KeycloakDistribution; - -import io.quarkus.test.junit.main.Launch; @DistributionTest(reInstall = DistributionTest.ReInstall.BEFORE_TEST) @RawDistOnly(reason = "Not possible to mount files using docker.") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ClusterConfigKeepAliveDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ClusterConfigKeepAliveDistTest.java index 8a5b0a4261a..24cc58c271e 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ClusterConfigKeepAliveDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ClusterConfigKeepAliveDistTest.java @@ -25,12 +25,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import com.google.common.base.CaseFormat; -import org.infinispan.commons.dataconversion.MediaType; -import org.infinispan.configuration.cache.Configuration; -import org.infinispan.configuration.parsing.ConfigurationBuilderHolder; -import org.infinispan.configuration.parsing.ParserRegistry; -import org.junit.jupiter.api.Test; import org.keycloak.config.CachingOptions; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; @@ -38,14 +32,22 @@ import org.keycloak.it.junit5.extension.TestProvider; import org.keycloak.it.resource.realm.TestRealmResourceTestProvider; import org.keycloak.it.utils.KeycloakDistribution; -import static io.restassured.RestAssured.when; -import static org.junit.jupiter.api.Assertions.assertEquals; +import com.google.common.base.CaseFormat; +import org.infinispan.commons.dataconversion.MediaType; +import org.infinispan.configuration.cache.Configuration; +import org.infinispan.configuration.parsing.ConfigurationBuilderHolder; +import org.infinispan.configuration.parsing.ParserRegistry; +import org.junit.jupiter.api.Test; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLUSTERED_CACHE_NUM_OWNERS; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_CLIENT_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_USER_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.USER_SESSION_CACHE_NAME; +import static io.restassured.RestAssured.when; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * @author Ryan Emerson */ diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CustomJpaEntityProviderDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CustomJpaEntityProviderDistTest.java index cb1e07bd749..3a211cbbb83 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CustomJpaEntityProviderDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CustomJpaEntityProviderDistTest.java @@ -17,17 +17,17 @@ package org.keycloak.it.cli.dist; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.junit5.extension.TestProvider; -import com.acme.provider.legacy.jpa.entity.CustomJpaEntityProvider; - -import io.quarkus.test.junit.main.Launch; import org.keycloak.it.utils.KeycloakDistribution; +import com.acme.provider.legacy.jpa.entity.CustomJpaEntityProvider; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + @DistributionTest @RawDistOnly(reason = "Containers are immutable") @Tag(DistributionTest.SMOKE) diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CustomUserProviderDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CustomUserProviderDistTest.java index 576757a2ea8..376310b91c6 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CustomUserProviderDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/CustomUserProviderDistTest.java @@ -17,14 +17,14 @@ package org.keycloak.it.cli.dist; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.junit5.extension.TestProvider; -import com.acme.provider.legacy.jpa.user.CustomUserProvider; +import com.acme.provider.legacy.jpa.user.CustomUserProvider; import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Test; @DistributionTest @RawDistOnly(reason = "Containers are immutable") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ExportDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ExportDistTest.java index 86ba2e0176a..bac410d23ed 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ExportDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ExportDistTest.java @@ -17,18 +17,19 @@ package org.keycloak.it.cli.dist; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.nio.file.Path; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.RawKeycloakDistribution; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertTrue; + @RawDistOnly(reason = "Containers are immutable") @DistributionTest(defaultOptions = "--db=dev-file") @Tag(DistributionTest.SMOKE) diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FeaturesDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FeaturesDistTest.java index bd31b7ecf5f..29aaefca73c 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FeaturesDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FeaturesDistTest.java @@ -1,12 +1,9 @@ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.condition.OS; +import java.util.Arrays; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.common.Profile; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; @@ -16,13 +13,18 @@ import org.keycloak.quarkus.runtime.cli.command.Build; import org.keycloak.quarkus.runtime.cli.command.Start; import org.keycloak.quarkus.runtime.cli.command.StartDev; -import java.util.Arrays; -import java.util.Set; -import java.util.stream.Collectors; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.junit.jupiter.api.condition.EnabledOnOs; +import org.junit.jupiter.api.condition.OS; + +import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; @DistributionTest @RawDistOnly(reason = "Containers are immutable") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FipsDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FipsDistTest.java index 151c4f72a6c..84f8edb8d41 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FipsDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/FipsDistTest.java @@ -19,8 +19,6 @@ package org.keycloak.it.cli.dist; import java.nio.file.Path; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.crypto.fips.FIPS1402Provider; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; @@ -29,6 +27,8 @@ import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.RawKeycloakDistribution; import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; @DistributionTest(keepAlive = true, defaultOptions = { "--db=dev-file", "--features=fips", "--http-enabled=true", "--hostname-strict=false" }) @RawDistOnly(reason = "Containers are immutable") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HealthDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HealthDistTest.java index 3a30432ead8..2ed562d9e80 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HealthDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HealthDistTest.java @@ -17,22 +17,22 @@ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.keycloak.it.junit5.extension.DistributionTest; -import org.keycloak.it.utils.KeycloakDistribution; - -import static io.restassured.RestAssured.when; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.jupiter.api.Assertions.assertThrows; - import java.io.IOException; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; +import org.keycloak.it.junit5.extension.DistributionTest; +import org.keycloak.it.utils.KeycloakDistribution; + +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + +import static io.restassured.RestAssured.when; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.junit.jupiter.api.Assertions.assertThrows; + @DistributionTest(keepAlive = true, requestPort = 9000, containerExposedPorts = {8080, 9000}) diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HelpCommandDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HelpCommandDistTest.java index b5affb53ce8..2b45b21905c 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HelpCommandDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HelpCommandDistTest.java @@ -17,20 +17,12 @@ package org.keycloak.it.cli.dist; -import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; - import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Locale; import java.util.regex.Pattern; -import org.apache.commons.io.FileUtils; -import org.approvaltests.Approvals; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.OS; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; @@ -43,12 +35,20 @@ import org.keycloak.quarkus.runtime.cli.command.Export; import org.keycloak.quarkus.runtime.cli.command.Import; import org.keycloak.quarkus.runtime.cli.command.Start; import org.keycloak.quarkus.runtime.cli.command.StartDev; - -import io.quarkus.test.junit.main.Launch; import org.keycloak.quarkus.runtime.cli.command.UpdateCompatibility; import org.keycloak.quarkus.runtime.cli.command.UpdateCompatibilityCheck; import org.keycloak.quarkus.runtime.cli.command.UpdateCompatibilityMetadata; +import io.quarkus.test.junit.main.Launch; +import org.apache.commons.io.FileUtils; +import org.approvaltests.Approvals; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.OS; + +import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; + @DistributionTest @RawDistOnly(reason = "Verifying the help message output doesn't need long spin-up of docker dist tests.") public class HelpCommandDistTest { diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HostnameV2DistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HostnameV2DistTest.java index 276ffb58f53..930e1dfc71e 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HostnameV2DistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HostnameV2DistTest.java @@ -17,13 +17,14 @@ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import io.quarkus.test.junit.main.LaunchResult; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; +import io.quarkus.test.junit.main.Launch; +import io.quarkus.test.junit.main.LaunchResult; +import org.junit.jupiter.api.Test; + import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HttpDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HttpDistTest.java index e29a846a189..8839098799a 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HttpDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/HttpDistTest.java @@ -17,8 +17,11 @@ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import org.junit.jupiter.api.Test; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; + import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; @@ -27,10 +30,8 @@ import org.keycloak.it.resource.realm.TestRealmResourceTestProvider; import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.RawKeycloakDistribution; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CompletableFuture; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.when; import static org.hamcrest.CoreMatchers.hasItem; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ImportAtStartupDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ImportAtStartupDistTest.java index dad0aa3e9ae..004ec0d37d9 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ImportAtStartupDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ImportAtStartupDistTest.java @@ -22,8 +22,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.function.Consumer; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.BeforeStartDistribution; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; @@ -33,6 +31,8 @@ import org.keycloak.it.utils.RawKeycloakDistribution; import io.quarkus.deployment.util.FileUtil; import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; @DistributionTest @RawDistOnly(reason = "Containers are immutable") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ImportDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ImportDistTest.java index 7699dd7ae0c..4c1f43bd21f 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ImportDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ImportDistTest.java @@ -26,10 +26,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; @@ -37,6 +33,10 @@ import org.keycloak.it.utils.KeycloakDistribution; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; @DistributionTest(defaultOptions = "--db=dev-file") @RawDistOnly(reason = "Containers are immutable") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/IpStackDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/IpStackDistTest.java index 33acd693c8a..e03f7022b81 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/IpStackDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/IpStackDistTest.java @@ -18,13 +18,14 @@ */ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.net.ConnectException; + import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; -import java.io.IOException; -import java.net.ConnectException; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.is; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JavaOptsScriptTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JavaOptsScriptTest.java index 79f36ce540c..2df4164f663 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JavaOptsScriptTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JavaOptsScriptTest.java @@ -17,18 +17,18 @@ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import io.quarkus.test.junit.main.LaunchResult; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledOnOs; -import org.junit.jupiter.api.condition.OS; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.DryRun; import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.junit5.extension.WithEnvVars; +import io.quarkus.test.junit.main.Launch; +import io.quarkus.test.junit.main.LaunchResult; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledOnOs; +import org.junit.jupiter.api.condition.OS; + import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JaxRsDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JaxRsDistTest.java index 8f585cbae66..d3cd73dc82f 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JaxRsDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/JaxRsDistTest.java @@ -17,9 +17,8 @@ package org.keycloak.it.cli.dist; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; +import java.util.concurrent.TimeUnit; + import org.keycloak.it.jaxrs.filter.TestFilterTestProvider; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; @@ -27,7 +26,9 @@ import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.junit5.extension.TestProvider; import org.keycloak.it.utils.KeycloakDistribution; -import java.util.concurrent.TimeUnit; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.when; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LiquibaseDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LiquibaseDistTest.java index 3eb988bad8d..195d95bad66 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LiquibaseDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LiquibaseDistTest.java @@ -1,11 +1,12 @@ package org.keycloak.it.cli.dist; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.utils.KeycloakDistribution; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + @DistributionTest @RawDistOnly(reason = "Containers are immutable") @Tag(DistributionTest.SLOW) diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java index 333f3fa8b65..5dccaf34d06 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/LoggingDistTest.java @@ -17,23 +17,12 @@ package org.keycloak.it.cli.dist; -import static io.restassured.RestAssured.when; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.quarkus.runtime.cli.command.Main.CONFIG_FILE_LONG_NAME; - import java.io.File; import java.io.IOException; import java.nio.charset.Charset; import java.nio.file.Path; import java.nio.file.Paths; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.config.LoggingOptions; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; @@ -42,10 +31,22 @@ import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.RawDistRootPath; import org.keycloak.it.utils.RawKeycloakDistribution; -import org.testcontainers.shaded.org.apache.commons.io.FileUtils; import io.quarkus.deployment.util.FileUtil; import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.testcontainers.shaded.org.apache.commons.io.FileUtils; + +import static org.keycloak.quarkus.runtime.cli.command.Main.CONFIG_FILE_LONG_NAME; + +import static io.restassured.RestAssured.when; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; @DistributionTest(keepAlive = true) @RawDistOnly(reason = "Too verbose for docker and enough to check raw dist") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementDistTest.java index f45de8cb836..356ba92685c 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementDistTest.java @@ -16,6 +16,13 @@ */ package org.keycloak.it.cli.dist; +import java.io.IOException; + +import org.keycloak.it.junit5.extension.CLIResult; +import org.keycloak.it.junit5.extension.DistributionTest; +import org.keycloak.it.junit5.extension.DistributionType; +import org.keycloak.it.utils.KeycloakDistribution; + import io.quarkus.test.junit.main.Launch; import io.quarkus.test.junit.main.LaunchResult; import org.junit.jupiter.api.MethodOrderer; @@ -23,12 +30,6 @@ import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import org.keycloak.it.junit5.extension.CLIResult; -import org.keycloak.it.junit5.extension.DistributionTest; -import org.keycloak.it.junit5.extension.DistributionType; -import org.keycloak.it.utils.KeycloakDistribution; - -import java.io.IOException; import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementHttpsDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementHttpsDistTest.java index c5ec68bb0af..e88771f1346 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementHttpsDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementHttpsDistTest.java @@ -16,15 +16,16 @@ */ package org.keycloak.it.cli.dist; +import org.keycloak.it.junit5.extension.CLIResult; +import org.keycloak.it.junit5.extension.DistributionTest; +import org.keycloak.it.junit5.extension.RawDistOnly; + import io.quarkus.test.junit.main.Launch; import io.quarkus.test.junit.main.LaunchResult; import io.restassured.RestAssured; import io.restassured.config.RedirectConfig; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.keycloak.it.junit5.extension.CLIResult; -import org.keycloak.it.junit5.extension.DistributionTest; -import org.keycloak.it.junit5.extension.RawDistOnly; import static io.restassured.RestAssured.when; import static org.hamcrest.CoreMatchers.is; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementOffDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementOffDistTest.java index f13bb356d22..862bed94d77 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementOffDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ManagementOffDistTest.java @@ -16,13 +16,14 @@ */ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import io.quarkus.test.junit.main.LaunchResult; -import org.junit.jupiter.api.Test; +import java.io.IOException; + import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; -import java.io.IOException; +import io.quarkus.test.junit.main.Launch; +import io.quarkus.test.junit.main.LaunchResult; +import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.when; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/MetricsDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/MetricsDistTest.java index f9a6af51327..46343136111 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/MetricsDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/MetricsDistTest.java @@ -17,6 +17,19 @@ package org.keycloak.it.cli.dist; +import java.io.IOException; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.TimeUnit; + +import org.keycloak.it.junit5.extension.CLIResult; +import org.keycloak.it.junit5.extension.DistributionTest; +import org.keycloak.it.utils.KeycloakDistribution; + +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.containsString; @@ -24,19 +37,6 @@ import static org.hamcrest.Matchers.matchesPattern; import static org.hamcrest.Matchers.not; import static org.junit.jupiter.api.Assertions.assertThrows; -import java.io.IOException; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.TimeUnit; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.keycloak.it.junit5.extension.CLIResult; -import org.keycloak.it.junit5.extension.DistributionTest; -import org.keycloak.it.utils.KeycloakDistribution; - -import io.quarkus.test.junit.main.Launch; - @DistributionTest(keepAlive = true, requestPort = 9000, containerExposedPorts = {8080, 9000}) diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/OpenApiDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/OpenApiDistTest.java index f17635b82a1..28287f9970f 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/OpenApiDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/OpenApiDistTest.java @@ -17,15 +17,16 @@ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; +import java.io.IOException; + import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.DryRun; import org.keycloak.it.utils.KeycloakDistribution; -import java.io.IOException; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.when; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/OptionsDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/OptionsDistTest.java index 940dde7c365..ea834ebf680 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/OptionsDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/OptionsDistTest.java @@ -19,11 +19,6 @@ package org.keycloak.it.cli.dist; import java.nio.file.Paths; -import io.quarkus.test.junit.main.Launch; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.DryRun; @@ -31,6 +26,12 @@ import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.junit5.extension.WithEnvVars; import org.keycloak.it.utils.KeycloakDistribution; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; + import static org.keycloak.quarkus.runtime.cli.command.Main.CONFIG_FILE_LONG_NAME; @DistributionTest diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ProxyHostnameV2DistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ProxyHostnameV2DistTest.java index ad426098f12..3ba0be2df5d 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ProxyHostnameV2DistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ProxyHostnameV2DistTest.java @@ -17,6 +17,15 @@ package org.keycloak.it.cli.dist; +import org.keycloak.it.junit5.extension.CLIResult; +import org.keycloak.it.junit5.extension.DistributionTest; +import org.keycloak.it.junit5.extension.RawDistOnly; +import org.keycloak.it.junit5.extension.TestProvider; +import org.keycloak.it.junit5.extension.WithEnvVars; +import org.keycloak.it.resource.realm.TestRealmResourceTestProvider; +import org.keycloak.it.utils.KeycloakDistribution; +import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; + import io.quarkus.test.junit.main.Launch; import io.quarkus.test.junit.main.LaunchResult; import io.restassured.RestAssured; @@ -26,14 +35,6 @@ import org.apache.http.HttpHeaders; import org.junit.Assert; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.keycloak.it.junit5.extension.CLIResult; -import org.keycloak.it.junit5.extension.DistributionTest; -import org.keycloak.it.junit5.extension.RawDistOnly; -import org.keycloak.it.junit5.extension.TestProvider; -import org.keycloak.it.junit5.extension.WithEnvVars; -import org.keycloak.it.resource.realm.TestRealmResourceTestProvider; -import org.keycloak.it.utils.KeycloakDistribution; -import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; import static io.restassured.RestAssured.given; import static io.restassured.RestAssured.when; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesAutoBuildDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesAutoBuildDistTest.java index e2e1cac1073..06ab896e763 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesAutoBuildDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesAutoBuildDistTest.java @@ -19,11 +19,6 @@ package org.keycloak.it.cli.dist; import java.util.function.Consumer; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.it.junit5.extension.BeforeStartDistribution; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; @@ -32,6 +27,11 @@ import org.keycloak.it.junit5.extension.WithEnvVars; import org.keycloak.it.utils.KeycloakDistribution; import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; @DistributionTest(defaultOptions = {"--db=dev-file", "--http-enabled=true", "--hostname-strict=false"}) @RawDistOnly(reason = "Containers are immutable") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesDistTest.java index 306f647111f..7e1d0167bf5 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/QuarkusPropertiesDistTest.java @@ -17,6 +17,18 @@ package org.keycloak.it.cli.dist; +import java.util.Optional; +import java.util.function.Consumer; + +import org.keycloak.it.junit5.extension.BeforeStartDistribution; +import org.keycloak.it.junit5.extension.CLIResult; +import org.keycloak.it.junit5.extension.DistributionTest; +import org.keycloak.it.junit5.extension.DryRun; +import org.keycloak.it.junit5.extension.KeepServerAlive; +import org.keycloak.it.junit5.extension.RawDistOnly; +import org.keycloak.it.junit5.extension.WithEnvVars; +import org.keycloak.it.utils.KeycloakDistribution; + import io.quarkus.test.junit.main.Launch; import io.restassured.RestAssured; import org.junit.jupiter.api.Disabled; @@ -28,17 +40,6 @@ import org.junit.jupiter.api.TestMethodOrder; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.EnabledOnOs; import org.junit.jupiter.api.condition.OS; -import org.keycloak.it.junit5.extension.BeforeStartDistribution; -import org.keycloak.it.junit5.extension.CLIResult; -import org.keycloak.it.junit5.extension.DistributionTest; -import org.keycloak.it.junit5.extension.DryRun; -import org.keycloak.it.junit5.extension.KeepServerAlive; -import org.keycloak.it.junit5.extension.RawDistOnly; -import org.keycloak.it.junit5.extension.WithEnvVars; -import org.keycloak.it.utils.KeycloakDistribution; - -import java.util.Optional; -import java.util.function.Consumer; import static io.restassured.RestAssured.when; import static org.hamcrest.Matchers.containsString; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ShowConfigCommandDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ShowConfigCommandDistTest.java index daada491a81..d8b7e21121e 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ShowConfigCommandDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ShowConfigCommandDistTest.java @@ -1,9 +1,8 @@ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import io.quarkus.test.junit.main.LaunchResult; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.nio.file.Path; +import java.nio.file.Paths; + import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.DryRun; @@ -13,13 +12,16 @@ import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.quarkus.runtime.cli.command.ShowConfig; import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; -import java.nio.file.Path; -import java.nio.file.Paths; +import io.quarkus.test.junit.main.Launch; +import io.quarkus.test.junit.main.LaunchResult; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.keycloak.quarkus.runtime.cli.command.Main.CONFIG_FILE_LONG_NAME; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; -import static org.keycloak.quarkus.runtime.cli.command.Main.CONFIG_FILE_LONG_NAME; @DistributionTest public class ShowConfigCommandDistTest { diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartAutoBuildDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartAutoBuildDistTest.java index e2718bd1192..ce2c4292513 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartAutoBuildDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartAutoBuildDistTest.java @@ -17,11 +17,6 @@ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.DryRun; @@ -30,9 +25,15 @@ import org.keycloak.it.junit5.extension.TestProvider; import org.keycloak.it.utils.KeycloakDistribution; import com.acme.provider.legacy.jpa.user.CustomUserProvider; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; + +import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; @DistributionTest @RawDistOnly(reason = "Containers are immutable") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartCommandDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartCommandDistTest.java index 50ed7106a60..34433ae5bb2 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartCommandDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartCommandDistTest.java @@ -17,27 +17,28 @@ package org.keycloak.it.cli.dist; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; -import static org.keycloak.quarkus.runtime.cli.command.Main.CONFIG_FILE_LONG_NAME; +import org.keycloak.it.junit5.extension.CLIResult; +import org.keycloak.it.junit5.extension.DistributionTest; +import org.keycloak.it.junit5.extension.DryRun; +import org.keycloak.it.junit5.extension.RawDistOnly; +import org.keycloak.it.junit5.extension.WithEnvVars; +import org.keycloak.it.utils.KeycloakDistribution; +import io.quarkus.test.junit.main.Launch; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import org.keycloak.it.junit5.extension.CLIResult; -import org.keycloak.it.junit5.extension.DistributionTest; -import org.keycloak.it.junit5.extension.DryRun; -import io.quarkus.test.junit.main.Launch; -import org.keycloak.it.junit5.extension.RawDistOnly; -import org.keycloak.it.junit5.extension.WithEnvVars; -import org.keycloak.it.utils.KeycloakDistribution; +import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; +import static org.keycloak.quarkus.runtime.cli.command.Main.CONFIG_FILE_LONG_NAME; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; @WithEnvVars({"KC_CACHE", "local"}) // avoid flakey port conflicts @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartDevCommandDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartDevCommandDistTest.java index 7bb1c867674..639fb111e46 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartDevCommandDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/StartDevCommandDistTest.java @@ -17,11 +17,9 @@ package org.keycloak.it.cli.dist; -import io.quarkus.test.junit.main.Launch; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; +import java.io.File; +import java.nio.file.Paths; + import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.DryRun; @@ -29,8 +27,11 @@ import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.RawKeycloakDistribution; -import java.io.File; -import java.nio.file.Paths; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import static org.junit.Assert.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ToolsCommandDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ToolsCommandDistTest.java index ceefe866877..833613952d8 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ToolsCommandDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/ToolsCommandDistTest.java @@ -17,11 +17,11 @@ package org.keycloak.it.cli.dist; +import org.keycloak.it.junit5.extension.DistributionTest; + import io.quarkus.test.junit.main.Launch; import io.quarkus.test.junit.main.LaunchResult; - import org.junit.jupiter.api.Test; -import org.keycloak.it.junit5.extension.DistributionTest; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/TracingDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/TracingDistTest.java index b3899dde0ac..c2e2c67c501 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/TracingDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/TracingDistTest.java @@ -17,15 +17,16 @@ package org.keycloak.it.cli.dist; +import org.keycloak.it.junit5.extension.CLIResult; +import org.keycloak.it.junit5.extension.DistributionTest; +import org.keycloak.it.junit5.extension.RawDistOnly; + import io.quarkus.test.junit.main.Launch; import io.quarkus.test.junit.main.LaunchResult; import org.junit.jupiter.api.MethodOrderer; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import org.keycloak.it.junit5.extension.CLIResult; -import org.keycloak.it.junit5.extension.DistributionTest; -import org.keycloak.it.junit5.extension.RawDistOnly; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) @DistributionTest diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/TruststoreDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/TruststoreDistTest.java index 7c6638b5871..d4377a5f21f 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/TruststoreDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/TruststoreDistTest.java @@ -17,21 +17,21 @@ package org.keycloak.it.cli.dist; -import io.restassured.RestAssured; +import java.nio.file.Path; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.RawKeycloakDistribution; import org.keycloak.truststore.TruststoreBuilder; -import java.nio.file.Path; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import io.restassured.RestAssured; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/UpdateCommandDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/UpdateCommandDistTest.java index 0f65b68a2c6..31d1c6b6a13 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/UpdateCommandDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/UpdateCommandDistTest.java @@ -17,18 +17,12 @@ package org.keycloak.it.cli.dist; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.it.cli.dist.Util.createTempFile; - import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; -import org.junit.jupiter.api.Test; import org.keycloak.common.Profile; import org.keycloak.common.Version; import org.keycloak.compatibility.CompatibilityResult; @@ -53,6 +47,13 @@ import org.keycloak.spi.infinispan.impl.remote.DefaultCacheRemoteConfigProviderF import org.keycloak.util.JsonSerialization; import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Test; + +import static org.keycloak.it.cli.dist.Util.createTempFile; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; @DistributionTest @RawDistOnly(reason = "Requires creating JSON file to be available between containers") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/VersionDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/VersionDistTest.java index ac82e203187..4401c42ba01 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/VersionDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/cli/dist/VersionDistTest.java @@ -17,11 +17,11 @@ package org.keycloak.it.cli.dist; +import org.keycloak.it.junit5.extension.DistributionTest; + import io.quarkus.test.junit.main.Launch; import io.quarkus.test.junit.main.LaunchResult; - import org.junit.jupiter.api.Test; -import org.keycloak.it.junit5.extension.DistributionTest; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/BasicDatabaseTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/BasicDatabaseTest.java index 0664ba38761..1e2ad2827d4 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/BasicDatabaseTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/BasicDatabaseTest.java @@ -17,17 +17,6 @@ package org.keycloak.it.storage.database; -import io.quarkus.logging.Log; -import io.quarkus.test.junit.main.Launch; -import org.apache.commons.io.FileUtils; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; -import org.keycloak.it.junit5.extension.CLIResult; -import org.keycloak.it.utils.RawDistRootPath; -import org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand; - import java.io.File; import java.io.IOException; import java.nio.charset.Charset; @@ -35,9 +24,21 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import org.keycloak.it.junit5.extension.CLIResult; +import org.keycloak.it.utils.RawDistRootPath; +import org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand; + +import io.quarkus.logging.Log; +import io.quarkus.test.junit.main.Launch; +import org.apache.commons.io.FileUtils; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; + import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @TestMethodOrder(MethodOrderer.OrderAnnotation.class) diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/ExternalInfinispanTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/ExternalInfinispanTest.java index 58b82128cb3..113f8f7c315 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/ExternalInfinispanTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/ExternalInfinispanTest.java @@ -17,10 +17,6 @@ package org.keycloak.it.storage.database; -import io.quarkus.test.junit.main.Launch; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.common.util.Retry; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.it.junit5.extension.CLIResult; @@ -28,6 +24,10 @@ import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.InfinispanContainer; import org.keycloak.it.junit5.extension.WithExternalInfinispan; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + import static io.restassured.RestAssured.when; @DistributionTest(keepAlive = true) diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/OracleTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/OracleTest.java index 4a6b60d1155..e45dfa2aa07 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/OracleTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/OracleTest.java @@ -17,6 +17,8 @@ package org.keycloak.it.storage.database; +import java.util.function.Consumer; + import org.keycloak.it.junit5.extension.BeforeStartDistribution; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.CLITest; @@ -24,8 +26,6 @@ import org.keycloak.it.junit5.extension.WithDatabase; import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.RawKeycloakDistribution; -import java.util.function.Consumer; - @CLITest @WithDatabase(alias = "oracle") @BeforeStartDistribution(OracleTest.CopyOracleJdbcDriver.class) diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/DatabaseOptionsDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/DatabaseOptionsDistTest.java index ec48a3a5fab..38bce212914 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/DatabaseOptionsDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/DatabaseOptionsDistTest.java @@ -17,15 +17,15 @@ package org.keycloak.it.storage.database.dist; -import io.quarkus.test.junit.main.Launch; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.WithDatabase; import org.keycloak.it.junit5.extension.WithEnvVars; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + @DistributionTest @WithDatabase(alias = "postgres") @Tag(DistributionTest.STORAGE) diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/DatasourcesDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/DatasourcesDistTest.java index 4bfb3b2d94c..9e94c6dbd0d 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/DatasourcesDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/DatasourcesDistTest.java @@ -1,12 +1,13 @@ package org.keycloak.it.storage.database.dist; -import io.quarkus.test.junit.main.Launch; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.RawDistOnly; import org.keycloak.it.junit5.extension.WithEnvVars; + +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; import picocli.CommandLine; @DistributionTest diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/MariaDBDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/MariaDBDistTest.java index bb11f983995..680609b1063 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/MariaDBDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/MariaDBDistTest.java @@ -17,8 +17,6 @@ package org.keycloak.it.storage.database.dist; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.WithDatabase; @@ -27,6 +25,8 @@ import org.keycloak.it.utils.RawDistRootPath; import org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand; import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; @DistributionTest(removeBuildOptionsAfterBuild = true) @WithDatabase(alias = "mariadb") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/MySQLDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/MySQLDistTest.java index 88d8f364e82..0dbbc2d2deb 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/MySQLDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/MySQLDistTest.java @@ -1,7 +1,5 @@ package org.keycloak.it.storage.database.dist; -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.WithDatabase; @@ -10,6 +8,8 @@ import org.keycloak.it.utils.RawDistRootPath; import org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand; import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; @DistributionTest(removeBuildOptionsAfterBuild = true) @WithDatabase(alias = "mysql") diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/PostgreSQLDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/PostgreSQLDistTest.java index 776e4b3f199..dd6036c71c6 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/PostgreSQLDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/PostgreSQLDistTest.java @@ -17,20 +17,20 @@ package org.keycloak.it.storage.database.dist; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.WithDatabase; import org.keycloak.it.storage.database.PostgreSQLTest; - -import io.quarkus.test.junit.main.Launch; import org.keycloak.it.utils.RawDistRootPath; import org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; + @DistributionTest(removeBuildOptionsAfterBuild = true) @WithDatabase(alias = "postgres") @Tag(DistributionTest.STORAGE) diff --git a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/TransactionConfigurationDistTest.java b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/TransactionConfigurationDistTest.java index 128faf6e9a7..26074633203 100644 --- a/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/TransactionConfigurationDistTest.java +++ b/quarkus/tests/integration/src/test/java/org/keycloak/it/storage/database/dist/TransactionConfigurationDistTest.java @@ -1,13 +1,13 @@ package org.keycloak.it.storage.database.dist; -import io.quarkus.test.junit.main.Launch; - -import org.junit.jupiter.api.Tag; -import org.junit.jupiter.api.Test; import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.it.junit5.extension.DistributionTest; import org.keycloak.it.junit5.extension.WithDatabase; +import io.quarkus.test.junit.main.Launch; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; + @DistributionTest @WithDatabase(alias = "mssql") @Tag(DistributionTest.STORAGE) diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/Keycloak.java b/quarkus/tests/junit5/src/main/java/org/keycloak/Keycloak.java index 011a1468622..f782483f734 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/Keycloak.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/Keycloak.java @@ -17,8 +17,6 @@ package org.keycloak; -import static java.util.Optional.ofNullable; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -26,8 +24,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeoutException; -import io.quarkus.bootstrap.forkjoin.QuarkusForkJoinWorkerThreadFactory; -import org.eclipse.microprofile.config.spi.ConfigProviderResolver; import org.keycloak.common.Version; import org.keycloak.common.crypto.FipsMode; import org.keycloak.config.HttpOptions; @@ -39,12 +35,14 @@ import org.keycloak.quarkus.runtime.Environment; import org.keycloak.quarkus.runtime.cli.Picocli; import org.keycloak.quarkus.runtime.configuration.ConfigArgsConfigSource; import org.keycloak.quarkus.runtime.configuration.Configuration; +import org.keycloak.quarkus.runtime.configuration.IgnoredArtifacts; import io.quarkus.bootstrap.app.AugmentAction; import io.quarkus.bootstrap.app.CuratedApplication; import io.quarkus.bootstrap.app.QuarkusBootstrap; import io.quarkus.bootstrap.app.RunningQuarkusApplication; import io.quarkus.bootstrap.app.StartupAction; +import io.quarkus.bootstrap.forkjoin.QuarkusForkJoinWorkerThreadFactory; import io.quarkus.bootstrap.model.ApplicationModel; import io.quarkus.bootstrap.resolver.AppModelResolverException; import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver; @@ -55,7 +53,9 @@ import io.quarkus.bootstrap.workspace.WorkspaceModuleId; import io.quarkus.maven.dependency.Dependency; import io.quarkus.maven.dependency.DependencyBuilder; import io.quarkus.runtime.configuration.QuarkusConfigFactory; -import org.keycloak.quarkus.runtime.configuration.IgnoredArtifacts; +import org.eclipse.microprofile.config.spi.ConfigProviderResolver; + +import static java.util.Optional.ofNullable; public class Keycloak { diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/BeforeStartDistribution.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/BeforeStartDistribution.java index 000cb569964..25681b59c6a 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/BeforeStartDistribution.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/BeforeStartDistribution.java @@ -22,6 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.function.Consumer; + import org.keycloak.it.utils.KeycloakDistribution; /** diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/CLIResult.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/CLIResult.java index 397faf1ce10..7a2a7aad818 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/CLIResult.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/CLIResult.java @@ -17,6 +17,14 @@ package org.keycloak.it.junit5.extension; +import java.util.List; +import java.util.regex.Pattern; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import io.quarkus.test.junit.main.LaunchResult; + import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -26,14 +34,6 @@ import static org.testcontainers.shaded.org.hamcrest.Matchers.equalTo; import static org.testcontainers.shaded.org.hamcrest.Matchers.is; import static org.testcontainers.shaded.org.hamcrest.Matchers.not; -import java.util.List; -import java.util.regex.Pattern; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.quarkus.test.junit.main.LaunchResult; - public interface CLIResult extends LaunchResult { static CLIResult create(List outputStream, List errStream, int exitCode) { diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/CLITestExtension.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/CLITestExtension.java index 7af0555ffb2..5c2d02f85a8 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/CLITestExtension.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/CLITestExtension.java @@ -17,17 +17,16 @@ package org.keycloak.it.junit5.extension; -import io.quarkus.deployment.util.FileUtil; -import io.quarkus.runtime.configuration.QuarkusConfigFactory; -import io.quarkus.test.junit.QuarkusMainTestExtension; -import io.quarkus.test.junit.main.Launch; -import io.quarkus.test.junit.main.LaunchResult; -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.api.extension.ExtensionContext.Namespace; -import org.junit.jupiter.api.extension.ExtensionContext.Store; -import org.junit.jupiter.api.extension.ParameterContext; -import org.junit.jupiter.api.extension.ParameterResolutionException; -import org.junit.jupiter.api.extension.ReflectiveInvocationContext; +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.RawDistRootPath; import org.keycloak.it.utils.RawKeycloakDistribution; @@ -40,17 +39,20 @@ import org.keycloak.quarkus.runtime.configuration.Configuration; import org.keycloak.quarkus.runtime.configuration.KeycloakPropertiesConfigSource; import org.keycloak.quarkus.runtime.integration.QuarkusPlatform; -import java.io.IOException; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import io.quarkus.deployment.util.FileUtil; +import io.quarkus.runtime.configuration.QuarkusConfigFactory; +import io.quarkus.test.junit.QuarkusMainTestExtension; +import io.quarkus.test.junit.main.Launch; +import io.quarkus.test.junit.main.LaunchResult; +import org.junit.jupiter.api.extension.ExtensionContext; +import org.junit.jupiter.api.extension.ExtensionContext.Namespace; +import org.junit.jupiter.api.extension.ExtensionContext.Store; +import org.junit.jupiter.api.extension.ParameterContext; +import org.junit.jupiter.api.extension.ParameterResolutionException; +import org.junit.jupiter.api.extension.ReflectiveInvocationContext; import static java.lang.System.setProperty; + import static org.keycloak.it.junit5.extension.DistributionTest.ReInstall.BEFORE_ALL; import static org.keycloak.it.junit5.extension.DistributionType.RAW; import static org.keycloak.quarkus.runtime.Environment.forceTestLaunchMode; diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DatabaseContainer.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DatabaseContainer.java index 35b448c92f5..d4bf01a8e3d 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DatabaseContainer.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DatabaseContainer.java @@ -20,6 +20,7 @@ package org.keycloak.it.junit5.extension; import java.time.Duration; import org.keycloak.it.utils.KeycloakDistribution; + import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.containers.MSSQLServerContainer; diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DistributionTest.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DistributionTest.java index c50cd7d2dc5..5b8bde3b7fa 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DistributionTest.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DistributionTest.java @@ -81,4 +81,3 @@ public @interface DistributionTest { */ int requestPort() default 8080; } - diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DistributionType.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DistributionType.java index bfe85dd9efd..d4d786f747f 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DistributionType.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/DistributionType.java @@ -19,6 +19,7 @@ package org.keycloak.it.junit5.extension; import java.util.Optional; import java.util.function.Function; + import org.keycloak.it.utils.DockerKeycloakDistribution; import org.keycloak.it.utils.KeycloakDistribution; import org.keycloak.it.utils.RawKeycloakDistribution; diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/InfinispanContainer.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/InfinispanContainer.java index 7c1b9244523..0636f9655a6 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/InfinispanContainer.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/InfinispanContainer.java @@ -19,10 +19,11 @@ package org.keycloak.it.junit5.extension; import java.util.Arrays; +import org.keycloak.connections.infinispan.InfinispanConnectionProvider; + import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.commons.configuration.StringConfiguration; import org.jboss.logging.Logger; -import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.testcontainers.images.PullPolicy; public class InfinispanContainer extends org.infinispan.server.test.core.InfinispanContainer { diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/KeycloakDistributionDecorator.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/KeycloakDistributionDecorator.java index a0acac6436f..59049fd5d04 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/KeycloakDistributionDecorator.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/KeycloakDistributionDecorator.java @@ -20,6 +20,7 @@ package org.keycloak.it.junit5.extension; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; + import org.keycloak.it.utils.KeycloakDistribution; public class KeycloakDistributionDecorator implements KeycloakDistribution { diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/RawDistOnly.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/RawDistOnly.java index e8683cab0a3..6444fb1f552 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/RawDistOnly.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/RawDistOnly.java @@ -21,6 +21,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import org.junit.jupiter.api.condition.EnabledIfSystemProperty; /** diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/ServerOptions.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/ServerOptions.java index e3b015d8bbf..b9f17ffa797 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/ServerOptions.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/ServerOptions.java @@ -17,17 +17,18 @@ package org.keycloak.it.junit5.extension; -import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Predicate; + import org.keycloak.quarkus.runtime.cli.command.Export; import org.keycloak.quarkus.runtime.cli.command.Import; import org.keycloak.quarkus.runtime.cli.command.ShowConfig; +import static org.keycloak.quarkus.runtime.cli.command.AbstractAutoBuildCommand.OPTIMIZED_BUILD_OPTION_LONG; + final class ServerOptions extends ArrayList { private static final Predicate IGNORED_ARGUMENTS = ((Predicate) s -> false) diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/Storage.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/Storage.java index 484c78e6fc1..cf7818eb051 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/Storage.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/Storage.java @@ -21,6 +21,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import org.junit.jupiter.api.extension.ExtendWith; /** diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/WithDatabase.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/WithDatabase.java index 8bd39075341..89e72c0b9b4 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/WithDatabase.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/WithDatabase.java @@ -21,6 +21,7 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; + import org.junit.jupiter.api.condition.EnabledIfSystemProperty; /** diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/WithExternalInfinispan.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/WithExternalInfinispan.java index e991c9f6d9a..1a31de3f30b 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/WithExternalInfinispan.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/junit5/extension/WithExternalInfinispan.java @@ -17,13 +17,13 @@ package org.keycloak.it.junit5.extension; -import org.junit.jupiter.api.condition.EnabledIfSystemProperty; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.junit.jupiter.api.condition.EnabledIfSystemProperty; + /** * {@link WithExternalInfinispan} is used to start an Infinispan container. */ diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/DockerKeycloakDistribution.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/DockerKeycloakDistribution.java index a883e533cf5..cbecac80715 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/DockerKeycloakDistribution.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/DockerKeycloakDistribution.java @@ -1,23 +1,5 @@ package org.keycloak.it.utils; -import com.github.dockerjava.api.DockerClient; -import com.github.dockerjava.api.exception.NotFoundException; -import io.restassured.RestAssured; -import org.jboss.logging.Logger; -import org.keycloak.common.Version; -import org.keycloak.it.junit5.extension.CLIResult; -import org.testcontainers.DockerClientFactory; -import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.output.OutputFrame; -import org.testcontainers.containers.output.OutputFrame.OutputType; -import org.testcontainers.containers.output.ToStringConsumer; -import org.testcontainers.containers.wait.strategy.Wait; -import org.testcontainers.images.RemoteDockerImage; -import org.testcontainers.images.builder.ImageFromDockerfile; -import org.testcontainers.utility.DockerImageName; -import org.testcontainers.utility.LazyFuture; -import org.testcontainers.utility.MountableFile; - import java.nio.file.Files; import java.nio.file.Path; import java.time.Duration; @@ -29,6 +11,25 @@ import java.util.concurrent.Executors; import java.util.function.Consumer; import java.util.stream.IntStream; +import org.keycloak.common.Version; +import org.keycloak.it.junit5.extension.CLIResult; + +import com.github.dockerjava.api.DockerClient; +import com.github.dockerjava.api.exception.NotFoundException; +import io.restassured.RestAssured; +import org.jboss.logging.Logger; +import org.testcontainers.DockerClientFactory; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.output.OutputFrame; +import org.testcontainers.containers.output.OutputFrame.OutputType; +import org.testcontainers.containers.output.ToStringConsumer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.images.RemoteDockerImage; +import org.testcontainers.images.builder.ImageFromDockerfile; +import org.testcontainers.utility.DockerImageName; +import org.testcontainers.utility.LazyFuture; +import org.testcontainers.utility.MountableFile; + public final class DockerKeycloakDistribution implements KeycloakDistribution { private static class BackupConsumer implements Consumer { diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/KeycloakDistribution.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/KeycloakDistribution.java index 00ca4c0c42b..5ca854ab707 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/KeycloakDistribution.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/KeycloakDistribution.java @@ -1,9 +1,10 @@ package org.keycloak.it.utils; +import java.nio.file.Path; +import java.util.List; + import org.keycloak.it.junit5.extension.CLIResult; import org.keycloak.quarkus.runtime.Environment; -import java.nio.file.Path; -import java.util.List; public interface KeycloakDistribution { diff --git a/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java b/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java index 08f643305d6..8e92fb03c4f 100644 --- a/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java +++ b/quarkus/tests/junit5/src/main/java/org/keycloak/it/utils/RawKeycloakDistribution.java @@ -55,16 +55,6 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import io.quarkus.deployment.util.FileUtil; -import io.quarkus.fs.util.ZipUtils; - -import io.restassured.RestAssured; -import org.awaitility.Awaitility; -import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.EmptyAsset; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; -import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.keycloak.common.Version; import org.keycloak.it.TestProvider; import org.keycloak.it.junit5.extension.CLIResult; @@ -73,6 +63,16 @@ import org.keycloak.quarkus.runtime.cli.command.Build; import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMapper; import org.keycloak.quarkus.runtime.configuration.mappers.PropertyMappers; +import io.quarkus.deployment.util.FileUtil; +import io.quarkus.fs.util.ZipUtils; +import io.restassured.RestAssured; +import org.awaitility.Awaitility; +import org.jboss.logging.Logger; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.EmptyAsset; +import org.jboss.shrinkwrap.api.exporter.ZipExporter; +import org.jboss.shrinkwrap.api.spec.JavaArchive; + import static org.keycloak.quarkus.runtime.Environment.LAUNCH_MODE; import static org.keycloak.quarkus.runtime.Environment.isWindows; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtResource.java index 00875db0b55..fc35e8a9817 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AdminExtResource.java @@ -1,12 +1,12 @@ package org.keycloak.admin.ui.rest; +import jakarta.ws.rs.Path; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.Path; - public final class AdminExtResource { private KeycloakSession session; private RealmModel realm; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AuthenticationManagementResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AuthenticationManagementResource.java index 0702dffce53..0b3d943c63d 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AuthenticationManagementResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AuthenticationManagementResource.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; @@ -12,14 +13,7 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; + import org.keycloak.admin.ui.rest.model.Authentication; import org.keycloak.admin.ui.rest.model.AuthenticationMapper; import org.keycloak.admin.ui.rest.model.ConfigurableRequiredActionProviderRepresentation; @@ -35,6 +29,15 @@ import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; + public class AuthenticationManagementResource extends RoleMappingResource { diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableEventListenersResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableEventListenersResource.java index 5dbdda3efd6..0d3e057bf45 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableEventListenersResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableEventListenersResource.java @@ -23,11 +23,7 @@ import java.util.List; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; + import org.keycloak.admin.ui.rest.model.EventListener; import org.keycloak.admin.ui.rest.model.ProviderMapper; import org.keycloak.events.EventListenerProvider; @@ -35,6 +31,12 @@ import org.keycloak.events.EventListenerProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; + public class AvailableEventListenersResource { private final KeycloakSession session; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableRoleMappingResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableRoleMappingResource.java index 0155866a50f..1f85e308cf2 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableRoleMappingResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/AvailableRoleMappingResource.java @@ -6,6 +6,7 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.ForbiddenException; @@ -15,11 +16,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; + import org.keycloak.admin.ui.rest.model.ClientRole; import org.keycloak.admin.ui.rest.model.RoleMapper; import org.keycloak.authorization.fgap.AdminPermissionsSchema; @@ -35,12 +32,18 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserProvider; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; + import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE_CLIENT_SCOPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE_COMPOSITE; import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLES; import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLES_CLIENT_SCOPE; import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLES_COMPOSITE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE_CLIENT_SCOPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE_COMPOSITE; public class AvailableRoleMappingResource extends RoleMappingResource { public AvailableRoleMappingResource(KeycloakSession session, RealmModel realm, AdminPermissionEvaluator auth) { diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/BruteForceUsersResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/BruteForceUsersResource.java index 5e56ab72dbc..a265614edf9 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/BruteForceUsersResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/BruteForceUsersResource.java @@ -5,17 +5,13 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.stream.Stream; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.jboss.logging.Logger; + import org.keycloak.admin.ui.rest.model.BruteUser; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.common.Profile; @@ -34,6 +30,13 @@ import org.keycloak.userprofile.UserProfileContext; import org.keycloak.userprofile.UserProfileProvider; import org.keycloak.utils.SearchQueryUtils; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.jboss.logging.Logger; + public class BruteForceUsersResource { private static final Logger logger = Logger.getLogger(BruteForceUsersResource.class); private static final String SEARCH_ID_PARAMETER = "id:"; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/EffectiveRoleMappingResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/EffectiveRoleMappingResource.java index 5a551993127..69c67246dee 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/EffectiveRoleMappingResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/EffectiveRoleMappingResource.java @@ -5,6 +5,7 @@ import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.GET; @@ -12,11 +13,7 @@ import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; + import org.keycloak.admin.ui.rest.model.ClientRole; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; @@ -27,6 +24,12 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; + import static org.keycloak.admin.ui.rest.model.RoleMapper.convertToModel; public class EffectiveRoleMappingResource extends RoleMappingResource { diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/SessionsResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/SessionsResource.java index c70d831adeb..7dad5a29e4c 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/SessionsResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/SessionsResource.java @@ -1,11 +1,15 @@ package org.keycloak.admin.ui.rest; +import java.util.Map; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; + import org.keycloak.admin.ui.rest.model.ClientIdSessionType; import org.keycloak.admin.ui.rest.model.ClientIdSessionType.SessionType; import org.keycloak.admin.ui.rest.model.SessionRepresentation; @@ -17,16 +21,13 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; import org.keycloak.models.light.LightweightUserAdapter; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; - -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; import org.keycloak.utils.StringUtil; -import java.util.Map; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import static org.keycloak.admin.ui.rest.model.ClientIdSessionType.SessionType.ALL; import static org.keycloak.admin.ui.rest.model.ClientIdSessionType.SessionType.OFFLINE; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmResource.java index 3e13f6bee9a..9f111975b54 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmResource.java @@ -19,14 +19,17 @@ package org.keycloak.admin.ui.rest; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.keycloak.admin.ui.rest.model.UIRealmRepresentation; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status.Family; + import org.keycloak.admin.ui.rest.model.UIRealmInfo; +import org.keycloak.admin.ui.rest.model.UIRealmRepresentation; import org.keycloak.models.KeycloakSession; import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.representations.userprofile.config.UPConfig; @@ -36,13 +39,11 @@ import org.keycloak.services.resources.admin.UserProfileResource; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.storage.UserStorageProviderModel; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status.Family; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; /** * This JAX-RS resource is decorating the Admin Realm API in order to support specific behaviors from the diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java index 5b23783b10d..6f529fb3317 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java @@ -8,18 +8,20 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; + +import org.keycloak.admin.ui.rest.model.RealmNameRepresentation; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.services.resources.admin.fgap.AdminPermissions; +import org.keycloak.services.resources.admin.fgap.RealmsPermissionEvaluator; + import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.admin.ui.rest.model.RealmNameRepresentation; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.services.resources.admin.fgap.AdminPermissions; -import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import org.keycloak.services.resources.admin.fgap.RealmsPermissionEvaluator; public class UIRealmsResource { diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/Authentication.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/Authentication.java index 1154e3a00f9..1d4ac950702 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/Authentication.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/Authentication.java @@ -1,6 +1,7 @@ package org.keycloak.admin.ui.rest.model; import java.util.Objects; + import org.eclipse.microprofile.openapi.annotations.media.Schema; public class Authentication { diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/BruteUser.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/BruteUser.java index c847ca5fbf7..ed62a53d5c2 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/BruteUser.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/BruteUser.java @@ -1,6 +1,7 @@ package org.keycloak.admin.ui.rest.model; import java.util.Map; + import org.keycloak.representations.idm.UserRepresentation; public class BruteUser extends UserRepresentation { diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/ClientRole.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/ClientRole.java index 6cc655c345d..6e756e927ee 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/ClientRole.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/ClientRole.java @@ -1,6 +1,7 @@ package org.keycloak.admin.ui.rest.model; import java.util.Objects; + import org.eclipse.microprofile.openapi.annotations.media.Schema; public final class ClientRole { diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/SessionRepresentation.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/SessionRepresentation.java index c7c1620cfe6..7de35df0e44 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/SessionRepresentation.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/model/SessionRepresentation.java @@ -1,11 +1,11 @@ package org.keycloak.admin.ui.rest.model; -import org.keycloak.admin.ui.rest.model.ClientIdSessionType.SessionType; - import java.util.HashMap; import java.util.Map; import java.util.Objects; +import org.keycloak.admin.ui.rest.model.ClientIdSessionType.SessionType; + public class SessionRepresentation { private String id; private String username; @@ -106,4 +106,3 @@ public class SessionRepresentation { return Objects.hash(id, type); } } - diff --git a/rest/admin-v2/api/src/main/java/org/keycloak/models/mapper/MapStructClientModelMapper.java b/rest/admin-v2/api/src/main/java/org/keycloak/models/mapper/MapStructClientModelMapper.java index dfe2b478e44..04b4d5c0a07 100644 --- a/rest/admin-v2/api/src/main/java/org/keycloak/models/mapper/MapStructClientModelMapper.java +++ b/rest/admin-v2/api/src/main/java/org/keycloak/models/mapper/MapStructClientModelMapper.java @@ -1,19 +1,20 @@ package org.keycloak.models.mapper; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.representations.admin.v2.ClientRepresentation; + import org.mapstruct.Context; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; import org.mapstruct.Named; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - @Mapper public interface MapStructClientModelMapper extends ClientModelMapper { @Mapping(target = "displayName", source = "name") diff --git a/rest/admin-v2/api/src/main/java/org/keycloak/representations/admin/v2/ClientRepresentation.java b/rest/admin-v2/api/src/main/java/org/keycloak/representations/admin/v2/ClientRepresentation.java index 345dee6e5d9..c6e8498e6d9 100644 --- a/rest/admin-v2/api/src/main/java/org/keycloak/representations/admin/v2/ClientRepresentation.java +++ b/rest/admin-v2/api/src/main/java/org/keycloak/representations/admin/v2/ClientRepresentation.java @@ -1,15 +1,17 @@ package org.keycloak.representations.admin.v2; +import java.util.LinkedHashSet; +import java.util.Set; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; + +import org.keycloak.representations.admin.v2.validation.CreateClient; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyDescription; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; import org.hibernate.validator.constraints.URL; -import org.keycloak.representations.admin.v2.validation.CreateClient; - -import java.util.LinkedHashSet; -import java.util.Set; public class ClientRepresentation extends BaseRepresentation { @@ -238,4 +240,3 @@ public class ClientRepresentation extends BaseRepresentation { } } } - diff --git a/rest/admin-v2/api/src/main/java/org/keycloak/services/ServiceException.java b/rest/admin-v2/api/src/main/java/org/keycloak/services/ServiceException.java index 19f2efe9769..88e186a775c 100644 --- a/rest/admin-v2/api/src/main/java/org/keycloak/services/ServiceException.java +++ b/rest/admin-v2/api/src/main/java/org/keycloak/services/ServiceException.java @@ -1,9 +1,9 @@ package org.keycloak.services; -import jakarta.ws.rs.core.Response; - import java.util.Optional; +import jakarta.ws.rs.core.Response; + public class ServiceException extends RuntimeException { private Response.Status suggestedHttpResponseStatus; diff --git a/rest/admin-v2/api/src/main/java/org/keycloak/services/client/DefaultClientService.java b/rest/admin-v2/api/src/main/java/org/keycloak/services/client/DefaultClientService.java index 3a35f573045..212468dcde0 100644 --- a/rest/admin-v2/api/src/main/java/org/keycloak/services/client/DefaultClientService.java +++ b/rest/admin-v2/api/src/main/java/org/keycloak/services/client/DefaultClientService.java @@ -1,6 +1,10 @@ package org.keycloak.services.client; +import java.util.Optional; +import java.util.stream.Stream; + import jakarta.ws.rs.core.Response; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -15,9 +19,6 @@ import org.keycloak.services.resources.admin.ClientsResource; import org.keycloak.validation.jakarta.HibernateValidatorProvider; import org.keycloak.validation.jakarta.JakartaValidatorProvider; -import java.util.Optional; -import java.util.stream.Stream; - // TODO public class DefaultClientService implements ClientService { private final KeycloakSession session; diff --git a/rest/admin-v2/api/src/main/java/org/keycloak/services/error/ValidationExceptionHandler.java b/rest/admin-v2/api/src/main/java/org/keycloak/services/error/ValidationExceptionHandler.java index 4610ebba131..14351eec133 100644 --- a/rest/admin-v2/api/src/main/java/org/keycloak/services/error/ValidationExceptionHandler.java +++ b/rest/admin-v2/api/src/main/java/org/keycloak/services/error/ValidationExceptionHandler.java @@ -1,13 +1,13 @@ package org.keycloak.services.error; +import java.util.stream.Collectors; + import jakarta.validation.ConstraintViolationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.ext.ExceptionMapper; import jakarta.ws.rs.ext.Provider; -import java.util.stream.Collectors; - @Provider public class ValidationExceptionHandler implements ExceptionMapper { diff --git a/rest/admin-v2/api/src/main/java/org/keycloak/validation/jakarta/HibernateValidatorProvider.java b/rest/admin-v2/api/src/main/java/org/keycloak/validation/jakarta/HibernateValidatorProvider.java index 5897c20c10e..70f65939f2c 100644 --- a/rest/admin-v2/api/src/main/java/org/keycloak/validation/jakarta/HibernateValidatorProvider.java +++ b/rest/admin-v2/api/src/main/java/org/keycloak/validation/jakarta/HibernateValidatorProvider.java @@ -1,13 +1,13 @@ package org.keycloak.validation.jakarta; +import java.util.Set; +import java.util.function.Function; + import jakarta.enterprise.inject.spi.CDI; import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import jakarta.validation.Validator; -import java.util.Set; -import java.util.function.Function; - public class HibernateValidatorProvider implements JakartaValidatorProvider { private final Validator validator = CDI.current().select(Validator.class).get(); diff --git a/rest/admin-v2/api/src/main/java/org/keycloak/validation/jakarta/JakartaValidatorProvider.java b/rest/admin-v2/api/src/main/java/org/keycloak/validation/jakarta/JakartaValidatorProvider.java index 0d22fe0ebd0..9839f527c7e 100644 --- a/rest/admin-v2/api/src/main/java/org/keycloak/validation/jakarta/JakartaValidatorProvider.java +++ b/rest/admin-v2/api/src/main/java/org/keycloak/validation/jakarta/JakartaValidatorProvider.java @@ -1,12 +1,12 @@ package org.keycloak.validation.jakarta; +import java.util.Set; +import java.util.function.Function; + import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import jakarta.validation.Validator; -import java.util.Set; -import java.util.function.Function; - public interface JakartaValidatorProvider { void validate(T object, Class... groups) throws ConstraintViolationException; diff --git a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/AdminApi.java b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/AdminApi.java index fc39ec26aa5..77c0cee8124 100644 --- a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/AdminApi.java +++ b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/AdminApi.java @@ -1,6 +1,7 @@ package org.keycloak.admin.api; import jakarta.ws.rs.Path; + import org.keycloak.admin.api.realm.RealmsApi; public interface AdminApi { diff --git a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/AdminRootV2.java b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/AdminRootV2.java index bb5dc27ecf7..c1a43c1123f 100644 --- a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/AdminRootV2.java +++ b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/AdminRootV2.java @@ -5,11 +5,13 @@ import jakarta.ws.rs.OPTIONS; import jakarta.ws.rs.Path; import jakarta.ws.rs.core.Context; import jakarta.ws.rs.ext.Provider; -import org.eclipse.microprofile.openapi.annotations.Operation; + import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; import org.keycloak.services.resources.admin.AdminCorsPreflightService; +import org.eclipse.microprofile.openapi.annotations.Operation; + @Provider @Path("admin/api") public class AdminRootV2 { diff --git a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/DefaultAdminApi.java b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/DefaultAdminApi.java index 3085988c1af..5b0ef6a106b 100644 --- a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/DefaultAdminApi.java +++ b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/DefaultAdminApi.java @@ -2,6 +2,7 @@ package org.keycloak.admin.api; import jakarta.ws.rs.NotAuthorizedException; import jakarta.ws.rs.Path; + import org.keycloak.Config; import org.keycloak.admin.api.realm.DefaultRealmsApi; import org.keycloak.admin.api.realm.RealmsApi; diff --git a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/ClientsApi.java b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/ClientsApi.java index 4965a557e4d..82450a462e8 100644 --- a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/ClientsApi.java +++ b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/ClientsApi.java @@ -2,12 +2,6 @@ package org.keycloak.admin.api.client; import java.util.stream.Stream; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.keycloak.representations.admin.v2.ClientRepresentation; -import org.keycloak.services.resources.KeycloakOpenAPI; - import jakarta.validation.Valid; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -17,6 +11,13 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +import org.keycloak.representations.admin.v2.ClientRepresentation; +import org.keycloak.services.resources.KeycloakOpenAPI; + +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; + @Tag(name = KeycloakOpenAPI.Admin.Tags.CLIENTS_V2) @Extension(name = KeycloakOpenAPI.Profiles.ADMIN, value = "") public interface ClientsApi { @@ -36,4 +37,3 @@ public interface ClientsApi { @Path("{id}") ClientApi client(@PathParam("id") String id); } - diff --git a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/DefaultClientApi.java b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/DefaultClientApi.java index ee4d6f23fa8..27669886ab4 100644 --- a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/DefaultClientApi.java +++ b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/DefaultClientApi.java @@ -3,6 +3,12 @@ package org.keycloak.admin.api.client; import java.io.IOException; import java.util.Objects; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.http.HttpResponse; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -19,14 +25,8 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; - import io.fabric8.zjsonpatch.JsonPatch; import io.fabric8.zjsonpatch.JsonPatchException; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; public class DefaultClientApi implements ClientApi { diff --git a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/DefaultClientsApi.java b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/DefaultClientsApi.java index 79c47206230..50f03fa6dc1 100644 --- a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/DefaultClientsApi.java +++ b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/client/DefaultClientsApi.java @@ -5,6 +5,10 @@ import java.util.Optional; import java.util.stream.Stream; import jakarta.validation.Valid; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; + import org.keycloak.http.HttpResponse; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -14,11 +18,6 @@ import org.keycloak.services.ServiceException; import org.keycloak.services.client.ClientService; import org.keycloak.services.client.DefaultClientService; import org.keycloak.services.resources.admin.ClientsResource; - -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.Response; - import org.keycloak.validation.jakarta.HibernateValidatorProvider; import org.keycloak.validation.jakarta.JakartaValidatorProvider; diff --git a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/DefaultRealmApi.java b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/DefaultRealmApi.java index edf6b5b8855..e84ad8d9d2d 100644 --- a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/DefaultRealmApi.java +++ b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/DefaultRealmApi.java @@ -1,6 +1,7 @@ package org.keycloak.admin.api.realm; import jakarta.ws.rs.Path; + import org.keycloak.admin.api.client.ClientsApi; import org.keycloak.admin.api.client.DefaultClientsApi; import org.keycloak.models.KeycloakSession; diff --git a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/DefaultRealmsApi.java b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/DefaultRealmsApi.java index 32514308f99..b217f08f023 100644 --- a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/DefaultRealmsApi.java +++ b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/DefaultRealmsApi.java @@ -2,6 +2,7 @@ package org.keycloak.admin.api.realm; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; + import org.keycloak.models.KeycloakSession; import org.keycloak.services.resources.admin.RealmsAdminResource; diff --git a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/RealmApi.java b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/RealmApi.java index 3a69618f44d..17ea5d56f01 100644 --- a/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/RealmApi.java +++ b/rest/admin-v2/rest/src/main/java/org/keycloak/admin/api/realm/RealmApi.java @@ -1,6 +1,7 @@ package org.keycloak.admin.api.realm; import jakarta.ws.rs.Path; + import org.keycloak.admin.api.client.ClientsApi; public interface RealmApi { diff --git a/rest/admin-v2/tests/src/test/java/org/keycloak/tests/admin/client/v2/ClientApiV2DisabledTest.java b/rest/admin-v2/tests/src/test/java/org/keycloak/tests/admin/client/v2/ClientApiV2DisabledTest.java index 4dd5ba2a4f8..ccd32ff0eeb 100644 --- a/rest/admin-v2/tests/src/test/java/org/keycloak/tests/admin/client/v2/ClientApiV2DisabledTest.java +++ b/rest/admin-v2/tests/src/test/java/org/keycloak/tests/admin/client/v2/ClientApiV2DisabledTest.java @@ -1,13 +1,15 @@ package org.keycloak.tests.admin.client.v2; +import org.keycloak.testframework.annotations.InjectHttpClient; +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; + import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.junit.jupiter.api.Test; -import org.keycloak.testframework.annotations.InjectHttpClient; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; + +import static org.keycloak.tests.admin.client.v2.ClientApiV2Test.HOSTNAME_LOCAL_ADMIN; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.keycloak.tests.admin.client.v2.ClientApiV2Test.HOSTNAME_LOCAL_ADMIN; /** * @author Vaclav Muzikar diff --git a/rest/admin-v2/tests/src/test/java/org/keycloak/tests/admin/client/v2/ClientApiV2Test.java b/rest/admin-v2/tests/src/test/java/org/keycloak/tests/admin/client/v2/ClientApiV2Test.java index 28d75eb7798..888e583d3db 100644 --- a/rest/admin-v2/tests/src/test/java/org/keycloak/tests/admin/client/v2/ClientApiV2Test.java +++ b/rest/admin-v2/tests/src/test/java/org/keycloak/tests/admin/client/v2/ClientApiV2Test.java @@ -17,19 +17,9 @@ package org.keycloak.tests.admin.client.v2; -import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; -import org.apache.http.HttpMessage; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPatch; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.util.EntityUtils; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.api.client.ClientApi; import org.keycloak.admin.client.Keycloak; import org.keycloak.common.Profile; @@ -45,8 +35,20 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import static org.hamcrest.MatcherAssert.assertThat; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.http.HttpMessage; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPatch; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.util.EntityUtils; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonAssertionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonAssertionType.java index 1bf90eaa9d8..9ee63c066c5 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonAssertionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonAssertionType.java @@ -16,8 +16,8 @@ */ package org.keycloak.dom.saml.common; -import javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; +import javax.xml.datatype.XMLGregorianCalendar; /** * SAML AssertionType diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonConditionsType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonConditionsType.java index 67175f5c1dd..f3c1929ca78 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonConditionsType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonConditionsType.java @@ -16,8 +16,8 @@ */ package org.keycloak.dom.saml.common; -import javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; +import javax.xml.datatype.XMLGregorianCalendar; /** * @author Anil.Saldhana@redhat.com diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonRequestAbstractType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonRequestAbstractType.java index 0d3272b6acd..75ff635a3ec 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonRequestAbstractType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonRequestAbstractType.java @@ -16,10 +16,10 @@ */ package org.keycloak.dom.saml.common; -import org.w3c.dom.Element; - -import javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.w3c.dom.Element; /** * SAML Request Abstract Type diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonResponseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonResponseType.java index 2af1a4a6827..76fed4e53d7 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonResponseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonResponseType.java @@ -16,10 +16,10 @@ */ package org.keycloak.dom.saml.common; -import org.w3c.dom.Element; - -import javax.xml.datatype.XMLGregorianCalendar; import java.io.Serializable; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.w3c.dom.Element; /** * @author Anil.Saldhana@redhat.com diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AssertionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AssertionType.java index 77be8c7cc8a..7972c8be743 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AssertionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AssertionType.java @@ -16,13 +16,14 @@ */ package org.keycloak.dom.saml.v1.assertion; -import org.keycloak.dom.saml.common.CommonAssertionType; -import org.w3c.dom.Element; - -import javax.xml.datatype.XMLGregorianCalendar; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.keycloak.dom.saml.common.CommonAssertionType; + +import org.w3c.dom.Element; /** * diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthorityBindingType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthorityBindingType.java index f1adc78be0c..53e688c276d 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthorityBindingType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthorityBindingType.java @@ -16,8 +16,8 @@ */ package org.keycloak.dom.saml.v1.assertion; -import javax.xml.namespace.QName; import java.net.URI; +import javax.xml.namespace.QName; /** * diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11SubjectConfirmationType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11SubjectConfirmationType.java index 36aa53c5652..09fcd837cee 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11SubjectConfirmationType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11SubjectConfirmationType.java @@ -16,13 +16,13 @@ */ package org.keycloak.dom.saml.v1.assertion; -import org.w3c.dom.Element; - import java.net.URI; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.w3c.dom.Element; + /** * diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AttributeQueryType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AttributeQueryType.java index 4dfeee0f87b..464d71f804e 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AttributeQueryType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AttributeQueryType.java @@ -16,13 +16,13 @@ */ package org.keycloak.dom.saml.v1.protocol; -import org.keycloak.dom.saml.v1.assertion.SAML11AttributeDesignatorType; - import java.net.URI; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.keycloak.dom.saml.v1.assertion.SAML11AttributeDesignatorType; + /** * * diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java index 71379f5f07f..14e57e29a92 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java @@ -16,14 +16,14 @@ */ package org.keycloak.dom.saml.v1.protocol; -import org.keycloak.dom.saml.v1.assertion.SAML11ActionType; -import org.keycloak.dom.saml.v1.assertion.SAML11EvidenceType; - import java.net.URI; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.keycloak.dom.saml.v1.assertion.SAML11ActionType; +import org.keycloak.dom.saml.v1.assertion.SAML11EvidenceType; + /** * diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestAbstractType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestAbstractType.java index 7bd388b89cf..d706cc2cdb6 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestAbstractType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestAbstractType.java @@ -16,13 +16,13 @@ */ package org.keycloak.dom.saml.v1.protocol; -import org.keycloak.dom.saml.common.CommonRequestAbstractType; - -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; + +import org.keycloak.dom.saml.common.CommonRequestAbstractType; /** * diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestType.java index a9e34eb6913..6eba3f16520 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestType.java @@ -16,10 +16,10 @@ */ package org.keycloak.dom.saml.v1.protocol; -import javax.xml.datatype.XMLGregorianCalendar; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; /** * diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11ResponseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11ResponseType.java index 7cde86221cb..f5008fd67e7 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11ResponseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11ResponseType.java @@ -16,12 +16,12 @@ */ package org.keycloak.dom.saml.v1.protocol; -import org.keycloak.dom.saml.v1.assertion.SAML11AssertionType; - -import javax.xml.datatype.XMLGregorianCalendar; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.keycloak.dom.saml.v1.assertion.SAML11AssertionType; /** * diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11StatusType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11StatusType.java index 36de5556938..ac711c2d103 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11StatusType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11StatusType.java @@ -16,10 +16,10 @@ */ package org.keycloak.dom.saml.v1.protocol; -import org.keycloak.dom.saml.common.CommonStatusDetailType; - import java.io.Serializable; +import org.keycloak.dom.saml.common.CommonStatusDetailType; + /** * diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitUsagesType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitUsagesType.java index c1473b73e1c..558b4bb8022 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitUsagesType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationLimitUsagesType.java @@ -24,11 +24,12 @@ package org.keycloak.dom.saml.v2.ac; +import java.math.BigInteger; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlType; -import java.math.BigInteger; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationPinType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationPinType.java index ad964bb2ed6..ec94ae4da70 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationPinType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ActivationPinType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorBaseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorBaseType.java index ba20b0dd7ba..ebe56c28753 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorBaseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorBaseType.java @@ -24,14 +24,15 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElementRef; import jakarta.xml.bind.annotation.XmlElementRefs; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorTransportProtocolType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorTransportProtocolType.java index 0c23e2b75f6..ecda209e403 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorTransportProtocolType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthenticatorTransportProtocolType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnContextDeclarationBaseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnContextDeclarationBaseType.java index 36cbf443f46..858c520286b 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnContextDeclarationBaseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnContextDeclarationBaseType.java @@ -24,6 +24,9 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; @@ -33,8 +36,6 @@ import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter; import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnMethodBaseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnMethodBaseType.java index bf2f063c717..ed4925c95bf 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnMethodBaseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/AuthnMethodBaseType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ComplexAuthenticatorType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ComplexAuthenticatorType.java index 3d222e80796..b54dc9d847a 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ComplexAuthenticatorType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ComplexAuthenticatorType.java @@ -24,14 +24,15 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElementRef; import jakarta.xml.bind.annotation.XmlElementRefs; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionOnlyType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionOnlyType.java index 73813fd5bcc..64463b28fe1 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionOnlyType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionOnlyType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionType.java index a063adf7726..cef8214cffd 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/ExtensionType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAnyElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementsType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementsType.java index df6f9b6d731..4f2147b346a 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementsType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/GoverningAgreementsType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/IdentificationType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/IdentificationType.java index 9de3c388da4..edd565b29ce 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/IdentificationType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/IdentificationType.java @@ -24,13 +24,14 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyActivationType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyActivationType.java index 6ca16b41b9d..b237ef3d4f9 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyActivationType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/KeyActivationType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/LengthType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/LengthType.java index 305ec414856..2eea9376b67 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/LengthType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/LengthType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.math.BigInteger; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import java.math.BigInteger; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/OperationalProtectionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/OperationalProtectionType.java index 71a30a4675b..1ffdef45ec5 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/OperationalProtectionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/OperationalProtectionType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PasswordType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PasswordType.java index 3353d991741..82b65b8dd00 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PasswordType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PasswordType.java @@ -24,6 +24,9 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; @@ -31,8 +34,6 @@ import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlSeeAlso; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrincipalAuthenticationMechanismType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrincipalAuthenticationMechanismType.java index b70d9442e6d..1a34825793d 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrincipalAuthenticationMechanismType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrincipalAuthenticationMechanismType.java @@ -24,14 +24,15 @@ package org.keycloak.dom.saml.v2.ac; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrivateKeyProtectionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrivateKeyProtectionType.java index 4eb398de316..7d92a5dbe11 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrivateKeyProtectionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PrivateKeyProtectionType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PublicKeyType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PublicKeyType.java index 3c217a7c9b9..dfa27c05e58 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PublicKeyType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/PublicKeyType.java @@ -24,14 +24,15 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecretKeyProtectionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecretKeyProtectionType.java index 8c9fd8256c9..bf23876f6a2 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecretKeyProtectionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecretKeyProtectionType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecurityAuditType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecurityAuditType.java index da0941197cb..f45269bd56c 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecurityAuditType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SecurityAuditType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SharedSecretChallengeResponseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SharedSecretChallengeResponseType.java index fa1c8244ba2..bd1ce3767cd 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SharedSecretChallengeResponseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/SharedSecretChallengeResponseType.java @@ -24,14 +24,15 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlSchemaType; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** * This element indicates that the Principal has been authenticated by a challenge-response protocol utilizing shared diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TechnicalProtectionBaseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TechnicalProtectionBaseType.java index 0df56541cb7..dca212aceae 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TechnicalProtectionBaseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TechnicalProtectionBaseType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TimeSyncTokenType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TimeSyncTokenType.java index 737abc5ca46..42d886a5aed 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TimeSyncTokenType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TimeSyncTokenType.java @@ -24,11 +24,12 @@ package org.keycloak.dom.saml.v2.ac; +import java.math.BigInteger; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlAttribute; import jakarta.xml.bind.annotation.XmlType; -import java.math.BigInteger; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TokenType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TokenType.java index f2e09240d5d..55f5ef5f9d9 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TokenType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/TokenType.java @@ -24,12 +24,13 @@ package org.keycloak.dom.saml.v2.ac; +import java.util.ArrayList; +import java.util.List; + import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; import jakarta.xml.bind.annotation.XmlElement; import jakarta.xml.bind.annotation.XmlType; -import java.util.ArrayList; -import java.util.List; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/classes/package-info.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/classes/package-info.java index fc0d0a8834e..83afd33c6ef 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/classes/package-info.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/classes/package-info.java @@ -16,4 +16,3 @@ */ package org.keycloak.dom.saml.v2.ac.classes; - diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/package-info.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/package-info.java index 4a0cde97bd7..4f02897ba8e 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/package-info.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/ac/package-info.java @@ -23,4 +23,3 @@ // @jakarta.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:SAML:2.0:ac", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.keycloak.dom.saml.v2.ac; - diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AssertionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AssertionType.java index 49cf7bd6f66..9cd7ac74c6b 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AssertionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AssertionType.java @@ -16,15 +16,16 @@ */ package org.keycloak.dom.saml.v2.assertion; -import org.keycloak.dom.saml.common.CommonAssertionType; -import org.w3c.dom.Element; - -import javax.xml.datatype.XMLGregorianCalendar; import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.keycloak.dom.saml.common.CommonAssertionType; + +import org.w3c.dom.Element; /** * diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ConditionsType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ConditionsType.java index 85e8f38ce1c..37498c09f1a 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ConditionsType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ConditionsType.java @@ -16,13 +16,13 @@ */ package org.keycloak.dom.saml.v2.assertion; -import org.keycloak.dom.saml.common.CommonConditionsType; - import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.keycloak.dom.saml.common.CommonConditionsType; + /** *

* Java class for ConditionsType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/EncryptedElementType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/EncryptedElementType.java index 18d6e067ff3..c4efda866be 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/EncryptedElementType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/EncryptedElementType.java @@ -16,10 +16,10 @@ */ package org.keycloak.dom.saml.v2.assertion; -import org.w3c.dom.Element; - import java.io.Serializable; +import org.w3c.dom.Element; + /** * Represents an element that is encrypted * diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/NameIDType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/NameIDType.java index f2f3497d533..649d97537b2 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/NameIDType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/NameIDType.java @@ -16,9 +16,10 @@ */ package org.keycloak.dom.saml.v2.assertion; +import java.net.URI; + import org.keycloak.common.util.StringSerialization; import org.keycloak.common.util.StringSerialization.Deserializer; -import java.net.URI; /** * Represents a NameIDType diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectConfirmationDataType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectConfirmationDataType.java index 1c2ef81ff4e..e10d50a6b94 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectConfirmationDataType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectConfirmationDataType.java @@ -16,12 +16,12 @@ */ package org.keycloak.dom.saml.v2.assertion; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; import java.io.Serializable; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/mdui/UIInfoType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/mdui/UIInfoType.java index 40d86b401db..f44fcfb7013 100644 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/mdui/UIInfoType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/mdui/UIInfoType.java @@ -1,12 +1,12 @@ package org.keycloak.dom.saml.v2.mdui; -import org.keycloak.dom.saml.v2.metadata.LocalizedNameType; -import org.keycloak.dom.saml.v2.metadata.LocalizedURIType; - import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import org.keycloak.dom.saml.v2.metadata.LocalizedNameType; +import org.keycloak.dom.saml.v2.metadata.LocalizedURIType; + /** * * *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/AffiliationDescriptorType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/AffiliationDescriptorType.java index 5f5abea90b1..b8596a46bb9 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/AffiliationDescriptorType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/AffiliationDescriptorType.java @@ -16,12 +16,12 @@ */ package org.keycloak.dom.saml.v2.metadata; -import org.keycloak.dom.xmlsec.w3.xmldsig.SignatureType; - -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; import java.util.ArrayList; import java.util.List; +import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.keycloak.dom.xmlsec.w3.xmldsig.SignatureType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/AttributeAuthorityDescriptorType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/AttributeAuthorityDescriptorType.java index b7d420b9660..3cebaa354cb 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/AttributeAuthorityDescriptorType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/AttributeAuthorityDescriptorType.java @@ -16,12 +16,12 @@ */ package org.keycloak.dom.saml.v2.metadata; -import org.keycloak.dom.saml.v2.assertion.AttributeType; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.keycloak.dom.saml.v2.assertion.AttributeType; + /** *

* Java class for AttributeAuthorityDescriptorType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/EntitiesDescriptorType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/EntitiesDescriptorType.java index 7456f130a86..a1269fdf30d 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/EntitiesDescriptorType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/EntitiesDescriptorType.java @@ -16,13 +16,13 @@ */ package org.keycloak.dom.saml.v2.metadata; -import org.w3c.dom.Element; - -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.w3c.dom.Element; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/EntityDescriptorType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/EntityDescriptorType.java index 87a245628c3..0afb77ee2ca 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/EntityDescriptorType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/EntityDescriptorType.java @@ -16,13 +16,13 @@ */ package org.keycloak.dom.saml.v2.metadata; -import org.w3c.dom.Element; - -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.w3c.dom.Element; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/ExtensionsType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/ExtensionsType.java index 729ba2acc10..2e9bb783f43 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/ExtensionsType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/ExtensionsType.java @@ -22,6 +22,7 @@ import java.util.List; import org.keycloak.dom.saml.v2.mdattr.EntityAttributes; import org.keycloak.dom.saml.v2.mdui.UIInfoType; + import org.w3c.dom.Element; /** diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/IDPSSODescriptorType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/IDPSSODescriptorType.java index 48efa492892..805eb597f7e 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/IDPSSODescriptorType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/IDPSSODescriptorType.java @@ -16,12 +16,12 @@ */ package org.keycloak.dom.saml.v2.metadata; -import org.keycloak.dom.saml.v2.assertion.AttributeType; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.keycloak.dom.saml.v2.assertion.AttributeType; + /** *

* Java class for IDPSSODescriptorType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/KeyDescriptorType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/KeyDescriptorType.java index 6ffa7543df6..af8c7c097b9 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/KeyDescriptorType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/KeyDescriptorType.java @@ -16,13 +16,14 @@ */ package org.keycloak.dom.saml.v2.metadata; -import org.keycloak.dom.xmlsec.w3.xmlenc.EncryptionMethodType; -import org.w3c.dom.Element; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.keycloak.dom.xmlsec.w3.xmlenc.EncryptionMethodType; + +import org.w3c.dom.Element; + /** *

* Java class for KeyDescriptorType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/RoleDescriptorType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/RoleDescriptorType.java index a46d03c1a5b..06ade35a0c8 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/RoleDescriptorType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/RoleDescriptorType.java @@ -16,13 +16,13 @@ */ package org.keycloak.dom.saml.v2.metadata; -import org.w3c.dom.Element; - -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.w3c.dom.Element; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/TypeWithOtherAttributes.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/TypeWithOtherAttributes.java index 6d826f97130..ab6f0581c4e 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/TypeWithOtherAttributes.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/TypeWithOtherAttributes.java @@ -16,10 +16,10 @@ */ package org.keycloak.dom.saml.v2.metadata; -import javax.xml.namespace.QName; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import javax.xml.namespace.QName; /** * Abstract base class for types that can have extra attributes diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/package-info.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/package-info.java index 385b3e7ace3..14664bdd8fb 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/package-info.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/metadata/package-info.java @@ -15,4 +15,3 @@ * limitations under the License. */ package org.keycloak.dom.saml.v2.metadata; - diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/profiles/attribute/dce/package-info.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/profiles/attribute/dce/package-info.java index df546e9d4f6..385173f4c9e 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/profiles/attribute/dce/package-info.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/profiles/attribute/dce/package-info.java @@ -16,4 +16,3 @@ */ package org.keycloak.dom.saml.v2.profiles.attribute.dce; - diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/profiles/sso/ecp/package-info.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/profiles/sso/ecp/package-info.java index c6e6ccebb7d..0c5f3d34508 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/profiles/sso/ecp/package-info.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/profiles/sso/ecp/package-info.java @@ -16,4 +16,3 @@ */ package org.keycloak.dom.saml.v2.profiles.sso.ecp; - diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AssertionIDRequestType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AssertionIDRequestType.java index 8f6cb7248b1..acf6d27e10b 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AssertionIDRequestType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AssertionIDRequestType.java @@ -16,10 +16,10 @@ */ package org.keycloak.dom.saml.v2.protocol; -import javax.xml.datatype.XMLGregorianCalendar; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AttributeQueryType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AttributeQueryType.java index 92249136754..52233c40d0e 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AttributeQueryType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AttributeQueryType.java @@ -16,12 +16,12 @@ */ package org.keycloak.dom.saml.v2.protocol; -import org.keycloak.dom.saml.v2.assertion.AttributeType; - -import javax.xml.datatype.XMLGregorianCalendar; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.keycloak.dom.saml.v2.assertion.AttributeType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AuthnRequestType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AuthnRequestType.java index fc58ddaade4..da065bcfb27 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AuthnRequestType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AuthnRequestType.java @@ -16,13 +16,13 @@ */ package org.keycloak.dom.saml.v2.protocol; +import java.net.URI; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.dom.saml.v2.assertion.ConditionsType; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.assertion.SubjectType; -import javax.xml.datatype.XMLGregorianCalendar; -import java.net.URI; - /** *

* Java class for AuthnRequestType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AuthzDecisionQueryType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AuthzDecisionQueryType.java index 3142ff762da..5a1551fdc92 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AuthzDecisionQueryType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/AuthzDecisionQueryType.java @@ -16,14 +16,14 @@ */ package org.keycloak.dom.saml.v2.protocol; -import org.keycloak.dom.saml.v2.assertion.ActionType; -import org.keycloak.dom.saml.v2.assertion.EvidenceType; - -import javax.xml.datatype.XMLGregorianCalendar; import java.net.URI; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.keycloak.dom.saml.v2.assertion.ActionType; +import org.keycloak.dom.saml.v2.assertion.EvidenceType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/LogoutRequestType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/LogoutRequestType.java index 181ecc37a77..bbe762b8a6c 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/LogoutRequestType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/LogoutRequestType.java @@ -16,14 +16,14 @@ */ package org.keycloak.dom.saml.v2.protocol; -import org.keycloak.dom.saml.v2.assertion.BaseIDAbstractType; -import org.keycloak.dom.saml.v2.assertion.EncryptedElementType; -import org.keycloak.dom.saml.v2.assertion.NameIDType; - -import javax.xml.datatype.XMLGregorianCalendar; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.keycloak.dom.saml.v2.assertion.BaseIDAbstractType; +import org.keycloak.dom.saml.v2.assertion.EncryptedElementType; +import org.keycloak.dom.saml.v2.assertion.NameIDType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/ManageNameIDRequestType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/ManageNameIDRequestType.java index d4e5524fb3b..ac82e64415c 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/ManageNameIDRequestType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/ManageNameIDRequestType.java @@ -16,11 +16,11 @@ */ package org.keycloak.dom.saml.v2.protocol; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.dom.saml.v2.assertion.EncryptedElementType; import org.keycloak.dom.saml.v2.assertion.NameIDType; -import javax.xml.datatype.XMLGregorianCalendar; - /** *

* Java class for ManageNameIDRequestType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/NameIDMappingRequestType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/NameIDMappingRequestType.java index 4ee658aecfb..fb71cf3d919 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/NameIDMappingRequestType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/NameIDMappingRequestType.java @@ -16,12 +16,12 @@ */ package org.keycloak.dom.saml.v2.protocol; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.dom.saml.v2.assertion.BaseIDAbstractType; import org.keycloak.dom.saml.v2.assertion.EncryptedElementType; import org.keycloak.dom.saml.v2.assertion.NameIDType; -import javax.xml.datatype.XMLGregorianCalendar; - /** *

* Java class for NameIDMappingRequestType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/NameIDMappingResponseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/NameIDMappingResponseType.java index 1bda133841e..83ec19f7d8b 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/NameIDMappingResponseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/NameIDMappingResponseType.java @@ -16,11 +16,11 @@ */ package org.keycloak.dom.saml.v2.protocol; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.dom.saml.v2.assertion.EncryptedElementType; import org.keycloak.dom.saml.v2.assertion.NameIDType; -import javax.xml.datatype.XMLGregorianCalendar; - /** *

* Java class for NameIDMappingResponseType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/RequestAbstractType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/RequestAbstractType.java index 4901ed60897..14177490371 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/RequestAbstractType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/RequestAbstractType.java @@ -16,13 +16,13 @@ */ package org.keycloak.dom.saml.v2.protocol; +import java.net.URI; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.dom.saml.common.CommonRequestAbstractType; import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.assertion.NameIDType; -import javax.xml.datatype.XMLGregorianCalendar; -import java.net.URI; - /** *

* Java class for RequestAbstractType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/ResponseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/ResponseType.java index d4b2bdcd0b7..9a96414ac0a 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/ResponseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/ResponseType.java @@ -16,13 +16,13 @@ */ package org.keycloak.dom.saml.v2.protocol; -import org.keycloak.dom.saml.v2.assertion.AssertionType; -import org.keycloak.dom.saml.v2.assertion.EncryptedAssertionType; - -import javax.xml.datatype.XMLGregorianCalendar; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.keycloak.dom.saml.v2.assertion.AssertionType; +import org.keycloak.dom.saml.v2.assertion.EncryptedAssertionType; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/StatusResponseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/StatusResponseType.java index c03ab20cf92..af02337e205 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/StatusResponseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/StatusResponseType.java @@ -16,12 +16,12 @@ */ package org.keycloak.dom.saml.v2.protocol; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.dom.saml.common.CommonResponseType; import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.assertion.NameIDType; -import javax.xml.datatype.XMLGregorianCalendar; - /** *

* Java class for StatusResponseType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/SubjectQueryAbstractType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/SubjectQueryAbstractType.java index 29ea5f74d9c..d9423e48262 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/SubjectQueryAbstractType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/SubjectQueryAbstractType.java @@ -16,10 +16,10 @@ */ package org.keycloak.dom.saml.v2.protocol; -import org.keycloak.dom.saml.v2.assertion.SubjectType; - import javax.xml.datatype.XMLGregorianCalendar; +import org.keycloak.dom.saml.v2.assertion.SubjectType; + /** *

* Java class for SubjectQueryAbstractType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/package-info.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/package-info.java index e0b0893b10c..e148bed63f3 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/package-info.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/protocol/package-info.java @@ -19,4 +19,3 @@ * Package containing the classes for the protocol of SAMLv2 */ package org.keycloak.dom.saml.v2.protocol; - diff --git a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/DSAKeyValueType.java b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/DSAKeyValueType.java index d5636174182..67095764002 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/DSAKeyValueType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/DSAKeyValueType.java @@ -17,9 +17,6 @@ package org.keycloak.dom.xmlsec.w3.xmldsig; -import org.keycloak.saml.common.constants.WSTrustConstants; -import org.keycloak.saml.common.exceptions.ProcessingException; - import java.math.BigInteger; import java.security.KeyFactory; import java.security.interfaces.DSAPrivateKey; @@ -28,6 +25,9 @@ import java.security.spec.DSAPrivateKeySpec; import java.security.spec.DSAPublicKeySpec; import java.util.Base64; +import org.keycloak.saml.common.constants.WSTrustConstants; +import org.keycloak.saml.common.exceptions.ProcessingException; + /** *

* Java class for DSAKeyValueType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/RSAKeyValueType.java b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/RSAKeyValueType.java index 4ae0bff3d87..0996fa6d035 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/RSAKeyValueType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/RSAKeyValueType.java @@ -17,9 +17,6 @@ package org.keycloak.dom.xmlsec.w3.xmldsig; -import org.keycloak.saml.common.constants.WSTrustConstants; -import org.keycloak.saml.common.exceptions.ProcessingException; - import java.math.BigInteger; import java.security.KeyFactory; import java.security.interfaces.RSAPrivateKey; @@ -28,6 +25,9 @@ import java.security.spec.RSAPrivateKeySpec; import java.security.spec.RSAPublicKeySpec; import java.util.Base64; +import org.keycloak.saml.common.constants.WSTrustConstants; +import org.keycloak.saml.common.exceptions.ProcessingException; + /** *

* Java class for RSAKeyValueType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/package-info.java b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/package-info.java index 8200753c52d..2c6543751f4 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/package-info.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmldsig/package-info.java @@ -15,4 +15,3 @@ * limitations under the License. */ package org.keycloak.dom.xmlsec.w3.xmldsig; - diff --git a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/EncryptionPropertyType.java b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/EncryptionPropertyType.java index 33b3a06a03d..08fed701307 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/EncryptionPropertyType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/EncryptionPropertyType.java @@ -16,11 +16,11 @@ */ package org.keycloak.dom.xmlsec.w3.xmlenc; -import javax.xml.namespace.QName; import java.net.URI; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import javax.xml.namespace.QName; /** *

diff --git a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/TransformsType.java b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/TransformsType.java index 2cb7c12c2e4..b11cc1937a3 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/TransformsType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/TransformsType.java @@ -16,12 +16,12 @@ */ package org.keycloak.dom.xmlsec.w3.xmlenc; -import org.keycloak.dom.xmlsec.w3.xmldsig.TransformType; - import java.util.ArrayList; import java.util.Collections; import java.util.List; +import org.keycloak.dom.xmlsec.w3.xmldsig.TransformType; + /** *

* Java class for TransformsType complex type. diff --git a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/package-info.java b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/package-info.java index 535eca893e6..e078c6831e7 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/package-info.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/xmlsec/w3/xmlenc/package-info.java @@ -15,4 +15,3 @@ * limitations under the License. */ package org.keycloak.dom.xmlsec.w3.xmlenc; - diff --git a/saml-core-api/src/main/java/org/keycloak/saml/common/constants/JBossSAMLConstants.java b/saml-core-api/src/main/java/org/keycloak/saml/common/constants/JBossSAMLConstants.java index 9f4515defaa..57b9e0e1a81 100755 --- a/saml-core-api/src/main/java/org/keycloak/saml/common/constants/JBossSAMLConstants.java +++ b/saml-core-api/src/main/java/org/keycloak/saml/common/constants/JBossSAMLConstants.java @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import javax.xml.namespace.QName; + import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ASSERTION_NSURI; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ECP_PROFILE; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.METADATA_NSURI; diff --git a/saml-core-api/src/main/java/org/keycloak/saml/common/exceptions/ParsingException.java b/saml-core-api/src/main/java/org/keycloak/saml/common/exceptions/ParsingException.java index 1799e3583b5..2aea369676f 100755 --- a/saml-core-api/src/main/java/org/keycloak/saml/common/exceptions/ParsingException.java +++ b/saml-core-api/src/main/java/org/keycloak/saml/common/exceptions/ParsingException.java @@ -16,9 +16,9 @@ */ package org.keycloak.saml.common.exceptions; +import java.security.GeneralSecurityException; import javax.xml.stream.Location; import javax.xml.stream.XMLStreamException; -import java.security.GeneralSecurityException; /** * General Exception indicating parsing exception diff --git a/saml-core/src/main/java/org/keycloak/saml/BaseSAML2BindingBuilder.java b/saml-core/src/main/java/org/keycloak/saml/BaseSAML2BindingBuilder.java index 52dd0e9db21..8294c5d0f94 100755 --- a/saml-core/src/main/java/org/keycloak/saml/BaseSAML2BindingBuilder.java +++ b/saml-core/src/main/java/org/keycloak/saml/BaseSAML2BindingBuilder.java @@ -17,9 +17,21 @@ package org.keycloak.saml; -import org.apache.xml.security.encryption.XMLCipher; - -import org.jboss.logging.Logger; +import java.io.IOException; +import java.net.URI; +import java.security.InvalidKeyException; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.Signature; +import java.security.SignatureException; +import java.security.cert.X509Certificate; +import java.util.HashMap; +import java.util.Map; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import javax.xml.crypto.dsig.CanonicalizationMethod; +import javax.xml.namespace.QName; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.saml.common.constants.GeneralConstants; @@ -33,26 +45,12 @@ 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.apache.xml.security.encryption.XMLCipher; +import org.jboss.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; -import javax.xml.crypto.dsig.CanonicalizationMethod; -import javax.xml.namespace.QName; -import java.io.IOException; -import java.net.URI; -import java.security.InvalidKeyException; -import java.security.KeyPair; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.Signature; -import java.security.SignatureException; -import java.security.cert.X509Certificate; -import java.util.HashMap; -import java.util.Map; - import static org.keycloak.common.util.HtmlUtils.escapeAttribute; import static org.keycloak.saml.common.util.StringUtil.isNotNull; diff --git a/saml-core/src/main/java/org/keycloak/saml/SAML2ArtifactResolveRequestBuilder.java b/saml-core/src/main/java/org/keycloak/saml/SAML2ArtifactResolveRequestBuilder.java index e989d176e85..37c197302e6 100644 --- a/saml-core/src/main/java/org/keycloak/saml/SAML2ArtifactResolveRequestBuilder.java +++ b/saml-core/src/main/java/org/keycloak/saml/SAML2ArtifactResolveRequestBuilder.java @@ -17,6 +17,10 @@ package org.keycloak.saml; +import java.net.URI; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.ArtifactResolveType; import org.keycloak.dom.saml.v2.protocol.ExtensionsType; @@ -24,11 +28,8 @@ 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.processing.api.saml.v2.request.SAML2Request; -import org.w3c.dom.Document; -import java.net.URI; -import java.util.LinkedList; -import java.util.List; +import org.w3c.dom.Document; public class SAML2ArtifactResolveRequestBuilder implements SamlProtocolExtensionsAwareBuilder { protected String artifact; diff --git a/saml-core/src/main/java/org/keycloak/saml/SAML2AuthnRequestBuilder.java b/saml-core/src/main/java/org/keycloak/saml/SAML2AuthnRequestBuilder.java index a67dc8d16a8..3daf6b8bf43 100755 --- a/saml-core/src/main/java/org/keycloak/saml/SAML2AuthnRequestBuilder.java +++ b/saml-core/src/main/java/org/keycloak/saml/SAML2AuthnRequestBuilder.java @@ -16,6 +16,10 @@ */ package org.keycloak.saml; +import java.net.URI; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.assertion.SubjectType; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; @@ -24,11 +28,8 @@ import org.keycloak.dom.saml.v2.protocol.RequestedAuthnContextType; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.saml.processing.core.saml.v2.common.IDGenerator; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import org.w3c.dom.Document; -import java.net.URI; -import java.util.LinkedList; -import java.util.List; +import org.w3c.dom.Document; /** * @author pedroigor diff --git a/saml-core/src/main/java/org/keycloak/saml/SAML2ErrorResponseBuilder.java b/saml-core/src/main/java/org/keycloak/saml/SAML2ErrorResponseBuilder.java index f9844d61ffc..d6033a1be10 100755 --- a/saml-core/src/main/java/org/keycloak/saml/SAML2ErrorResponseBuilder.java +++ b/saml-core/src/main/java/org/keycloak/saml/SAML2ErrorResponseBuilder.java @@ -19,10 +19,11 @@ package org.keycloak.saml; import java.util.LinkedList; import java.util.List; + import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.ExtensionsType; -import org.keycloak.dom.saml.v2.protocol.StatusResponseType; import org.keycloak.dom.saml.v2.protocol.ResponseType; +import org.keycloak.dom.saml.v2.protocol.StatusResponseType; import org.keycloak.dom.saml.v2.protocol.StatusType; import org.keycloak.saml.common.exceptions.ConfigurationException; import org.keycloak.saml.common.exceptions.ParsingException; @@ -31,6 +32,7 @@ import org.keycloak.saml.processing.api.saml.v2.response.SAML2Response; import org.keycloak.saml.processing.core.saml.v2.common.IDGenerator; import org.keycloak.saml.processing.core.saml.v2.factories.JBossSAMLAuthnResponseFactory; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; + import org.w3c.dom.Document; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/SAML2LoginResponseBuilder.java b/saml-core/src/main/java/org/keycloak/saml/SAML2LoginResponseBuilder.java index 0988d7e4323..369365903c3 100755 --- a/saml-core/src/main/java/org/keycloak/saml/SAML2LoginResponseBuilder.java +++ b/saml-core/src/main/java/org/keycloak/saml/SAML2LoginResponseBuilder.java @@ -17,6 +17,10 @@ package org.keycloak.saml; +import java.net.URI; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AudienceRestrictionType; import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; @@ -39,11 +43,8 @@ import org.keycloak.saml.processing.core.saml.v2.holders.IssuerInfoHolder; import org.keycloak.saml.processing.core.saml.v2.holders.SPInfoHolder; import org.keycloak.saml.processing.core.saml.v2.util.StatementUtil; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import org.w3c.dom.Document; -import java.net.URI; -import java.util.LinkedList; -import java.util.List; +import org.w3c.dom.Document; import static org.keycloak.saml.common.util.StringUtil.isNotNull; diff --git a/saml-core/src/main/java/org/keycloak/saml/SAML2LogoutRequestBuilder.java b/saml-core/src/main/java/org/keycloak/saml/SAML2LogoutRequestBuilder.java index 890a95fabcc..2b588d8684b 100755 --- a/saml-core/src/main/java/org/keycloak/saml/SAML2LogoutRequestBuilder.java +++ b/saml-core/src/main/java/org/keycloak/saml/SAML2LogoutRequestBuilder.java @@ -17,6 +17,10 @@ package org.keycloak.saml; +import java.net.URI; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.ExtensionsType; import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; @@ -25,11 +29,8 @@ import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import org.w3c.dom.Document; -import java.net.URI; -import java.util.LinkedList; -import java.util.List; +import org.w3c.dom.Document; /** * @author Bill Burke diff --git a/saml-core/src/main/java/org/keycloak/saml/SAML2LogoutResponseBuilder.java b/saml-core/src/main/java/org/keycloak/saml/SAML2LogoutResponseBuilder.java index 8ccb812d371..33ae5316c7c 100755 --- a/saml-core/src/main/java/org/keycloak/saml/SAML2LogoutResponseBuilder.java +++ b/saml-core/src/main/java/org/keycloak/saml/SAML2LogoutResponseBuilder.java @@ -17,7 +17,11 @@ package org.keycloak.saml; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.dom.saml.v2.assertion.NameIDType; +import org.keycloak.dom.saml.v2.protocol.ExtensionsType; import org.keycloak.dom.saml.v2.protocol.StatusCodeType; import org.keycloak.dom.saml.v2.protocol.StatusResponseType; import org.keycloak.dom.saml.v2.protocol.StatusType; @@ -28,11 +32,8 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.api.saml.v2.response.SAML2Response; import org.keycloak.saml.processing.core.saml.v2.common.IDGenerator; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import org.w3c.dom.Document; -import java.util.LinkedList; -import java.util.List; -import org.keycloak.dom.saml.v2.protocol.ExtensionsType; +import org.w3c.dom.Document; /** * @author Bill Burke diff --git a/saml-core/src/main/java/org/keycloak/saml/SAML2NameIDBuilder.java b/saml-core/src/main/java/org/keycloak/saml/SAML2NameIDBuilder.java index d3104e89c34..d93d8fc1fba 100644 --- a/saml-core/src/main/java/org/keycloak/saml/SAML2NameIDBuilder.java +++ b/saml-core/src/main/java/org/keycloak/saml/SAML2NameIDBuilder.java @@ -16,10 +16,10 @@ */ package org.keycloak.saml; -import org.keycloak.dom.saml.v2.assertion.NameIDType; - import java.net.URI; +import org.keycloak.dom.saml.v2.assertion.NameIDType; + public class SAML2NameIDBuilder { private final NameIDType nameIdType; private String format; diff --git a/saml-core/src/main/java/org/keycloak/saml/SAML2NameIDPolicyBuilder.java b/saml-core/src/main/java/org/keycloak/saml/SAML2NameIDPolicyBuilder.java index 00d15518a9d..fff9a5f2017 100755 --- a/saml-core/src/main/java/org/keycloak/saml/SAML2NameIDPolicyBuilder.java +++ b/saml-core/src/main/java/org/keycloak/saml/SAML2NameIDPolicyBuilder.java @@ -16,10 +16,10 @@ */ package org.keycloak.saml; -import org.keycloak.dom.saml.v2.protocol.NameIDPolicyType; - import java.net.URI; +import org.keycloak.dom.saml.v2.protocol.NameIDPolicyType; + /** * @author pedroigor */ diff --git a/saml-core/src/main/java/org/keycloak/saml/SAML2RequestedAuthnContextBuilder.java b/saml-core/src/main/java/org/keycloak/saml/SAML2RequestedAuthnContextBuilder.java index 2e180b86f85..169c384ca5d 100644 --- a/saml-core/src/main/java/org/keycloak/saml/SAML2RequestedAuthnContextBuilder.java +++ b/saml-core/src/main/java/org/keycloak/saml/SAML2RequestedAuthnContextBuilder.java @@ -16,12 +16,12 @@ */ package org.keycloak.saml; -import org.keycloak.dom.saml.v2.protocol.AuthnContextComparisonType; -import org.keycloak.dom.saml.v2.protocol.RequestedAuthnContextType; - import java.util.LinkedList; import java.util.List; +import org.keycloak.dom.saml.v2.protocol.AuthnContextComparisonType; +import org.keycloak.dom.saml.v2.protocol.RequestedAuthnContextType; + public class SAML2RequestedAuthnContextBuilder { private final RequestedAuthnContextType requestedAuthnContextType; private AuthnContextComparisonType comparison; diff --git a/saml-core/src/main/java/org/keycloak/saml/SAMLRequestParser.java b/saml-core/src/main/java/org/keycloak/saml/SAMLRequestParser.java index 1dac787e7c0..f49833774a0 100755 --- a/saml-core/src/main/java/org/keycloak/saml/SAMLRequestParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/SAMLRequestParser.java @@ -17,7 +17,9 @@ package org.keycloak.saml; -import org.jboss.logging.Logger; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; import org.keycloak.common.util.StreamUtil; import org.keycloak.saml.common.PicketLinkLogger; @@ -29,9 +31,7 @@ import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.saml.processing.web.util.PostBindingUtil; import org.keycloak.saml.processing.web.util.RedirectBindingUtil; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/saml-core/src/main/java/org/keycloak/saml/SPMetadataDescriptor.java b/saml-core/src/main/java/org/keycloak/saml/SPMetadataDescriptor.java index d91691c1b1f..8c8f0b6ffcd 100755 --- a/saml-core/src/main/java/org/keycloak/saml/SPMetadataDescriptor.java +++ b/saml-core/src/main/java/org/keycloak/saml/SPMetadataDescriptor.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -38,11 +37,12 @@ import org.keycloak.dom.saml.v2.metadata.KeyTypes; import org.keycloak.dom.saml.v2.metadata.SPSSODescriptorType; import org.keycloak.dom.xmlsec.w3.xmlenc.EncryptionMethodType; import org.keycloak.saml.processing.core.saml.v2.common.IDGenerator; + import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.XMLDSIG_NSURI; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.PROTOCOL_NSURI; +import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.XMLDSIG_NSURI; /** * @author Bill Burke diff --git a/saml-core/src/main/java/org/keycloak/saml/SamlProtocolExtensionsAwareBuilder.java b/saml-core/src/main/java/org/keycloak/saml/SamlProtocolExtensionsAwareBuilder.java index 2192df615e5..3043a323239 100644 --- a/saml-core/src/main/java/org/keycloak/saml/SamlProtocolExtensionsAwareBuilder.java +++ b/saml-core/src/main/java/org/keycloak/saml/SamlProtocolExtensionsAwareBuilder.java @@ -18,6 +18,7 @@ package org.keycloak.saml; import javax.xml.stream.XMLStreamWriter; + import org.keycloak.saml.common.exceptions.ProcessingException; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/common/DefaultPicketLinkLogger.java b/saml-core/src/main/java/org/keycloak/saml/common/DefaultPicketLinkLogger.java index 0d781c66f33..e485109594f 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/DefaultPicketLinkLogger.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/DefaultPicketLinkLogger.java @@ -17,7 +17,14 @@ package org.keycloak.saml.common; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.security.GeneralSecurityException; +import javax.security.auth.login.LoginException; +import javax.xml.crypto.dsig.XMLSignatureException; +import javax.xml.stream.Location; + +import jakarta.xml.ws.WebServiceException; + import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.saml.common.constants.WSTrustConstants; import org.keycloak.saml.common.exceptions.ConfigurationException; @@ -30,16 +37,10 @@ import org.keycloak.saml.common.exceptions.fed.IssueInstantMissingException; import org.keycloak.saml.common.exceptions.fed.IssuerNotTrustedException; import org.keycloak.saml.common.exceptions.fed.SignatureValidationException; import org.keycloak.saml.common.exceptions.fed.WSTrustException; + +import org.jboss.logging.Logger; import org.w3c.dom.Element; -import javax.security.auth.login.LoginException; -import javax.xml.crypto.dsig.XMLSignatureException; -import javax.xml.stream.Location; - -import jakarta.xml.ws.WebServiceException; -import java.io.IOException; -import java.security.GeneralSecurityException; - /** *@author Pedro Silva * diff --git a/saml-core/src/main/java/org/keycloak/saml/common/PicketLinkLogger.java b/saml-core/src/main/java/org/keycloak/saml/common/PicketLinkLogger.java index 1f7353a8972..bc8b84b2634 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/PicketLinkLogger.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/PicketLinkLogger.java @@ -18,6 +18,14 @@ package org.keycloak.saml.common; +import java.io.IOException; +import java.security.GeneralSecurityException; +import javax.security.auth.login.LoginException; +import javax.xml.crypto.dsig.XMLSignatureException; +import javax.xml.stream.Location; + +import jakarta.xml.ws.WebServiceException; + import org.keycloak.saml.common.exceptions.ConfigurationException; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ProcessingException; @@ -28,14 +36,8 @@ import org.keycloak.saml.common.exceptions.fed.IssueInstantMissingException; import org.keycloak.saml.common.exceptions.fed.IssuerNotTrustedException; import org.keycloak.saml.common.exceptions.fed.SignatureValidationException; import org.keycloak.saml.common.exceptions.fed.WSTrustException; -import org.w3c.dom.Element; -import javax.security.auth.login.LoginException; -import javax.xml.crypto.dsig.XMLSignatureException; -import javax.xml.stream.Location; -import jakarta.xml.ws.WebServiceException; -import java.io.IOException; -import java.security.GeneralSecurityException; +import org.w3c.dom.Element; /** *

This interface acts as a Log Facade for PicketLink, from which exceptions and messages should be created or diff --git a/saml-core/src/main/java/org/keycloak/saml/common/parsers/AbstractParser.java b/saml-core/src/main/java/org/keycloak/saml/common/parsers/AbstractParser.java index 1846b371eec..bb5c649abaa 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/parsers/AbstractParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/parsers/AbstractParser.java @@ -16,6 +16,20 @@ */ package org.keycloak.saml.common.parsers; +import java.io.InputStream; +import java.util.regex.Pattern; +import javax.xml.stream.EventFilter; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.events.Characters; +import javax.xml.stream.events.EndElement; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; +import javax.xml.stream.util.EventReaderDelegate; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; + import org.keycloak.common.util.Environment; import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; @@ -25,19 +39,6 @@ import org.keycloak.saml.common.util.SecurityActions; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.common.util.SystemPropertiesUtil; -import javax.xml.stream.EventFilter; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.events.Characters; -import javax.xml.stream.events.XMLEvent; -import javax.xml.stream.util.EventReaderDelegate; -import java.io.InputStream; -import java.util.regex.Pattern; -import javax.xml.stream.events.EndElement; -import javax.xml.stream.events.StartElement; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMSource; import org.w3c.dom.Node; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/common/parsers/AbstractStaxParser.java b/saml-core/src/main/java/org/keycloak/saml/common/parsers/AbstractStaxParser.java index 6d84a819374..3b80f52521c 100644 --- a/saml-core/src/main/java/org/keycloak/saml/common/parsers/AbstractStaxParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/parsers/AbstractStaxParser.java @@ -16,10 +16,6 @@ */ package org.keycloak.saml.common.parsers; -import org.keycloak.saml.common.PicketLinkLogger; -import org.keycloak.saml.common.PicketLinkLoggerFactory; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.common.util.StaxParserUtil; import java.util.Objects; import javax.xml.namespace.QName; import javax.xml.stream.XMLEventReader; @@ -27,6 +23,11 @@ import javax.xml.stream.events.EndElement; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; +import org.keycloak.saml.common.PicketLinkLogger; +import org.keycloak.saml.common.PicketLinkLoggerFactory; +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.util.StaxParserUtil; + /** * Simple support for STaX type of parsing. Parses single element and allows processing its direct children. * diff --git a/saml-core/src/main/java/org/keycloak/saml/common/parsers/AnyDomParser.java b/saml-core/src/main/java/org/keycloak/saml/common/parsers/AnyDomParser.java index e64fd8b4271..b2fd4c95e45 100644 --- a/saml-core/src/main/java/org/keycloak/saml/common/parsers/AnyDomParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/parsers/AnyDomParser.java @@ -16,15 +16,16 @@ */ package org.keycloak.saml.common.parsers; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.common.util.StaxParserUtil; -import org.w3c.dom.Element; - -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; import java.util.LinkedList; import java.util.List; import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.util.StaxParserUtil; + +import org.w3c.dom.Element; /** * Parses any DOM tree to a list of DOM representations. diff --git a/saml-core/src/main/java/org/keycloak/saml/common/parsers/StaxParser.java b/saml-core/src/main/java/org/keycloak/saml/common/parsers/StaxParser.java index 8f78a79282a..95ce4cfb74c 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/parsers/StaxParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/parsers/StaxParser.java @@ -16,10 +16,10 @@ */ package org.keycloak.saml.common.parsers; -import org.keycloak.saml.common.exceptions.ParsingException; - import javax.xml.stream.XMLEventReader; +import org.keycloak.saml.common.exceptions.ParsingException; + /** * Interface to indicate the parser. */ diff --git a/saml-core/src/main/java/org/keycloak/saml/common/util/DocumentUtil.java b/saml-core/src/main/java/org/keycloak/saml/common/util/DocumentUtil.java index 6b4cc5fee70..3e811e201aa 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/util/DocumentUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/util/DocumentUtil.java @@ -16,20 +16,15 @@ */ package org.keycloak.saml.common.util; -import org.keycloak.saml.common.PicketLinkLogger; -import org.keycloak.saml.common.PicketLinkLoggerFactory; -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.w3c.dom.DOMException; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.Reader; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.Objects; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -42,15 +37,21 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.Reader; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.Objects; + +import org.keycloak.saml.common.PicketLinkLogger; +import org.keycloak.saml.common.PicketLinkLoggerFactory; +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.w3c.dom.DOMException; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; /** * Utility dealing with DOM diff --git a/saml-core/src/main/java/org/keycloak/saml/common/util/StaxParserUtil.java b/saml-core/src/main/java/org/keycloak/saml/common/util/StaxParserUtil.java index a6fdd7e2f3a..29f9af9b44c 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/util/StaxParserUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/util/StaxParserUtil.java @@ -16,24 +16,17 @@ */ package org.keycloak.saml.common.util; -import org.keycloak.common.util.StringPropertyReplacer; -import org.keycloak.common.util.SystemEnvProperties; -import org.keycloak.saml.common.ErrorCodes; -import org.keycloak.saml.common.PicketLinkLogger; -import org.keycloak.saml.common.PicketLinkLoggerFactory; -import org.keycloak.saml.common.constants.GeneralConstants; -import org.keycloak.saml.common.constants.JBossSAMLURIConstants; -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.processing.core.parsers.util.HasQName; -import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - +import java.io.InputStream; +import java.io.StringReader; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.StringTokenizer; +import java.util.concurrent.atomic.AtomicBoolean; import javax.xml.XMLConstants; import javax.xml.datatype.Duration; +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import javax.xml.stream.Location; import javax.xml.stream.XMLEventReader; @@ -52,15 +45,22 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; -import java.io.InputStream; -import java.io.StringReader; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.StringTokenizer; -import java.util.concurrent.atomic.AtomicBoolean; -import javax.xml.datatype.XMLGregorianCalendar; + +import org.keycloak.common.util.StringPropertyReplacer; +import org.keycloak.common.util.SystemEnvProperties; +import org.keycloak.saml.common.ErrorCodes; +import org.keycloak.saml.common.PicketLinkLogger; +import org.keycloak.saml.common.PicketLinkLoggerFactory; +import org.keycloak.saml.common.constants.GeneralConstants; +import org.keycloak.saml.common.constants.JBossSAMLURIConstants; +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.processing.core.parsers.util.HasQName; +import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; /** * Utility for the stax based parser diff --git a/saml-core/src/main/java/org/keycloak/saml/common/util/StaxUtil.java b/saml-core/src/main/java/org/keycloak/saml/common/util/StaxUtil.java index f10ecf5b5af..d2a96d288ef 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/util/StaxUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/util/StaxUtil.java @@ -16,25 +16,26 @@ */ package org.keycloak.saml.common.util; -import org.keycloak.saml.common.PicketLinkLogger; -import org.keycloak.saml.common.PicketLinkLoggerFactory; -import org.keycloak.saml.common.constants.GeneralConstants; -import org.keycloak.saml.common.exceptions.ProcessingException; -import org.w3c.dom.Attr; -import org.w3c.dom.DOMException; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; - +import java.io.OutputStream; +import java.io.Writer; +import java.util.Stack; import javax.xml.namespace.QName; import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.Result; -import java.io.OutputStream; -import java.io.Writer; -import java.util.Stack; + +import org.keycloak.saml.common.PicketLinkLogger; +import org.keycloak.saml.common.PicketLinkLoggerFactory; +import org.keycloak.saml.common.constants.GeneralConstants; +import org.keycloak.saml.common.exceptions.ProcessingException; + +import org.w3c.dom.Attr; +import org.w3c.dom.DOMException; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; /** * Utility class that deals with StAX diff --git a/saml-core/src/main/java/org/keycloak/saml/common/util/TransformerUtil.java b/saml-core/src/main/java/org/keycloak/saml/common/util/TransformerUtil.java index 48238f9b8c9..03fd0fb37ad 100755 --- a/saml-core/src/main/java/org/keycloak/saml/common/util/TransformerUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/util/TransformerUtil.java @@ -16,22 +16,10 @@ */ package org.keycloak.saml.common.util; -import org.keycloak.saml.common.ErrorCodes; -import org.keycloak.saml.common.PicketLinkLogger; -import org.keycloak.saml.common.PicketLinkLoggerFactory; -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.processing.core.util.FixXMLConstants; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - +import java.util.Iterator; +import java.util.Properties; +import java.util.Stack; import javax.xml.XMLConstants; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.JAXBElement; -import jakarta.xml.bind.util.JAXBSource; import javax.xml.namespace.QName; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.Attribute; @@ -52,9 +40,23 @@ import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.URIResolver; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.stax.StAXSource; -import java.util.Iterator; -import java.util.Properties; -import java.util.Stack; + +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.util.JAXBSource; + +import org.keycloak.saml.common.ErrorCodes; +import org.keycloak.saml.common.PicketLinkLogger; +import org.keycloak.saml.common.PicketLinkLoggerFactory; +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.processing.core.util.FixXMLConstants; + +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * Utility to deal with JAXP Transformer diff --git a/saml-core/src/main/java/org/keycloak/saml/common/util/XmlKeyInfoKeyNameTransformer.java b/saml-core/src/main/java/org/keycloak/saml/common/util/XmlKeyInfoKeyNameTransformer.java index cda01d36529..bb4cb856a30 100644 --- a/saml-core/src/main/java/org/keycloak/saml/common/util/XmlKeyInfoKeyNameTransformer.java +++ b/saml-core/src/main/java/org/keycloak/saml/common/util/XmlKeyInfoKeyNameTransformer.java @@ -47,4 +47,3 @@ public enum XmlKeyInfoKeyNameTransformer { } } } - diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/request/SAML2Request.java b/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/request/SAML2Request.java index c99cc6674ea..370aacdcdfe 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/request/SAML2Request.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/request/SAML2Request.java @@ -16,6 +16,16 @@ */ package org.keycloak.saml.processing.api.saml.v2.request; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Writer; +import java.net.URI; +import java.net.URL; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.ArtifactResolveType; @@ -43,16 +53,6 @@ import org.keycloak.saml.processing.core.util.JAXPValidationUtil; import org.w3c.dom.Document; -import javax.xml.datatype.XMLGregorianCalendar; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Writer; -import java.net.URI; -import java.net.URL; - /** * API for SAML2 Request * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/response/SAML2Response.java b/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/response/SAML2Response.java index 83e085c3d55..c86fe7da19e 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/response/SAML2Response.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/response/SAML2Response.java @@ -16,6 +16,18 @@ */ package org.keycloak.saml.processing.api.saml.v2.response; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.Writer; +import java.net.URI; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.assertion.ActionType; import org.keycloak.dom.saml.v2.assertion.AssertionType; @@ -58,22 +70,11 @@ import org.keycloak.saml.processing.core.saml.v2.util.AssertionUtil; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; import org.keycloak.saml.processing.core.saml.v2.writers.SAMLResponseWriter; import org.keycloak.saml.processing.core.util.JAXPValidationUtil; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.Writer; -import java.net.URI; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; - import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.PROTOCOL_NSURI; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/sig/SAML2Signature.java b/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/sig/SAML2Signature.java index dd21333e3ba..ee132fde958 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/sig/SAML2Signature.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/api/saml/v2/sig/SAML2Signature.java @@ -16,6 +16,16 @@ */ package org.keycloak.saml.processing.api.saml.v2.sig; +import java.security.GeneralSecurityException; +import java.security.KeyPair; +import java.security.cert.X509Certificate; +import javax.xml.crypto.MarshalException; +import javax.xml.crypto.dsig.DigestMethod; +import javax.xml.crypto.dsig.SignatureMethod; +import javax.xml.crypto.dsig.XMLSignatureException; +import javax.xml.parsers.ParserConfigurationException; + +import org.keycloak.rotation.KeyLocator; import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; import org.keycloak.saml.common.constants.JBossSAMLConstants; @@ -23,21 +33,12 @@ import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.core.util.SignatureUtilTransferObject; import org.keycloak.saml.processing.core.util.XMLSignatureUtil; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import javax.xml.crypto.MarshalException; -import javax.xml.crypto.dsig.DigestMethod; -import javax.xml.crypto.dsig.SignatureMethod; -import javax.xml.crypto.dsig.XMLSignatureException; -import javax.xml.parsers.ParserConfigurationException; -import java.security.GeneralSecurityException; -import java.security.KeyPair; -import java.security.cert.X509Certificate; -import org.keycloak.rotation.KeyLocator; - /** * Class that deals with SAML2 Signature * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/api/util/DeflateUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/api/util/DeflateUtil.java index 58923f87337..471492ab5e7 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/api/util/DeflateUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/api/util/DeflateUtil.java @@ -16,8 +16,6 @@ */ package org.keycloak.saml.processing.api.util; -import org.keycloak.saml.common.constants.GeneralConstants; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,6 +25,8 @@ import java.util.zip.DeflaterOutputStream; import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; +import org.keycloak.saml.common.constants.GeneralConstants; + /** * Encoder of saml messages based on DEFLATE compression * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11AssertionParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11AssertionParser.java index a00742cc378..2962ba80229 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11AssertionParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11AssertionParser.java @@ -16,6 +16,14 @@ */ package org.keycloak.saml.processing.core.parsers.saml; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.EndElement; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; + import org.keycloak.dom.saml.v1.assertion.SAML11AssertionType; import org.keycloak.dom.saml.v1.assertion.SAML11AttributeStatementType; import org.keycloak.dom.saml.v1.assertion.SAML11AuthenticationStatementType; @@ -29,22 +37,15 @@ import org.keycloak.saml.common.constants.JBossSAMLConstants; 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.parsers.StaxParser; import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.common.util.StringUtil; import org.keycloak.saml.processing.core.parsers.util.SAML11ParserUtil; import org.keycloak.saml.processing.core.saml.v1.SAML11Constants; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import org.w3c.dom.Element; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.EndElement; -import javax.xml.stream.events.StartElement; -import javax.xml.stream.events.XMLEvent; -import org.keycloak.saml.common.parsers.StaxParser; +import org.w3c.dom.Element; /** * Parse the saml assertion diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11RequestParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11RequestParser.java index 4a38c99bc93..15bb62f7a0c 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11RequestParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11RequestParser.java @@ -16,6 +16,12 @@ */ package org.keycloak.saml.processing.core.parsers.saml; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v1.protocol.SAML11AttributeQueryType; import org.keycloak.dom.saml.v1.protocol.SAML11AuthenticationQueryType; import org.keycloak.dom.saml.v1.protocol.SAML11AuthorizationDecisionQueryType; @@ -24,18 +30,12 @@ import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; import org.keycloak.saml.common.constants.JBossSAMLConstants; import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.parsers.StaxParser; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.util.SAML11ParserUtil; import org.keycloak.saml.processing.core.saml.v1.SAML11Constants; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.StartElement; -import org.keycloak.saml.common.parsers.StaxParser; - /** * Parse the SAML2 AuthnRequest * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11ResponseParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11ResponseParser.java index eea572b7dee..9b7a2373cab 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11ResponseParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11ResponseParser.java @@ -16,6 +16,14 @@ */ package org.keycloak.saml.processing.core.parsers.saml; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.EndElement; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; + import org.keycloak.dom.saml.v1.assertion.SAML11AssertionType; import org.keycloak.dom.saml.v1.protocol.SAML11ResponseType; import org.keycloak.dom.saml.v1.protocol.SAML11StatusCodeType; @@ -25,19 +33,12 @@ import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; import org.keycloak.saml.common.constants.JBossSAMLConstants; import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.parsers.StaxParser; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.saml.v1.SAML11Constants; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import org.w3c.dom.Element; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.EndElement; -import javax.xml.stream.events.StartElement; -import javax.xml.stream.events.XMLEvent; -import org.keycloak.saml.common.parsers.StaxParser; +import org.w3c.dom.Element; /** * Parse the SAML 11 Response diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11SubjectParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11SubjectParser.java index c57b186f23b..31ecb4f119e 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11SubjectParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAML11SubjectParser.java @@ -16,6 +16,14 @@ */ package org.keycloak.saml.processing.core.parsers.saml; +import java.net.URI; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.EndElement; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; + import org.keycloak.dom.saml.v1.assertion.SAML11NameIdentifierType; import org.keycloak.dom.saml.v1.assertion.SAML11SubjectConfirmationType; import org.keycloak.dom.saml.v1.assertion.SAML11SubjectType; @@ -24,19 +32,11 @@ import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; import org.keycloak.saml.common.constants.JBossSAMLConstants; import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.parsers.StaxParser; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.util.SAML11ParserUtil; import org.keycloak.saml.processing.core.saml.v1.SAML11Constants; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.EndElement; -import javax.xml.stream.events.StartElement; -import javax.xml.stream.events.XMLEvent; -import java.net.URI; -import org.keycloak.saml.common.parsers.StaxParser; - /** * Parse the saml subject * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParser.java index d85d8c68728..e85d952f0d1 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParser.java @@ -16,35 +16,35 @@ */ package org.keycloak.saml.processing.core.parsers.saml; -import org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames; -import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLAttributeQueryParser; -import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLSloRequestParser; -import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLSloResponseParser; -import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLArtifactResolveParser; -import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLArtifactResponseParser; -import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLResponseParser; -import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLAuthNRequestParser; -import org.keycloak.saml.common.ErrorCodes; -import org.keycloak.saml.common.constants.JBossSAMLConstants; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.common.parsers.AbstractParser; -import org.keycloak.saml.common.util.StaxParserUtil; -import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAssertionParser; -import org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLEntitiesDescriptorParser; -import org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLEntityDescriptorParser; -import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLProtocolQNames; -import org.keycloak.saml.processing.core.saml.v1.SAML11Constants; - import java.util.HashMap; import java.util.Map; import javax.xml.namespace.QName; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; + +import org.keycloak.saml.common.ErrorCodes; +import org.keycloak.saml.common.constants.JBossSAMLConstants; +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.parsers.AbstractParser; import org.keycloak.saml.common.parsers.StaxParser; +import org.keycloak.saml.common.util.StaxParserUtil; +import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAssertionParser; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAssertionQNames; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAuthnStatementParser; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLEncryptedAssertionParser; +import org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLEntitiesDescriptorParser; +import org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLEntityDescriptorParser; +import org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames; +import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLArtifactResolveParser; +import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLArtifactResponseParser; +import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLAttributeQueryParser; +import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLAuthNRequestParser; +import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLProtocolQNames; +import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLResponseParser; +import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLSloRequestParser; +import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLSloResponseParser; +import org.keycloak.saml.processing.core.saml.v1.SAML11Constants; /** * Parse SAML payload diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/AbstractStaxSamlAssertionParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/AbstractStaxSamlAssertionParser.java index 0c3ac5847de..c794f06d07d 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/AbstractStaxSamlAssertionParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/AbstractStaxSamlAssertionParser.java @@ -16,9 +16,10 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import javax.xml.namespace.QName; + import org.keycloak.saml.common.parsers.AbstractStaxParser; import org.keycloak.saml.processing.core.parsers.util.QNameEnumLookup; -import javax.xml.namespace.QName; /** * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionParser.java index 91f074db0ab..c9b644f920a 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionParser.java @@ -16,15 +16,16 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.saml.common.ErrorCodes; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; /** * Parse the saml assertion diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionQNames.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionQNames.java index 9f5d09a12e0..98448b8a94b 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionQNames.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAssertionQNames.java @@ -16,10 +16,11 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import javax.xml.namespace.QName; + import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.parsers.saml.xmldsig.XmlDSigQNames; import org.keycloak.saml.processing.core.parsers.util.HasQName; -import javax.xml.namespace.QName; /** * Elements and attribute names from saml-schema-assertion-2.0.xsd diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeParser.java index 4f3f3bfdf51..8e38efca0b0 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeParser.java @@ -16,20 +16,20 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; -import org.keycloak.dom.saml.v2.assertion.AttributeType; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.common.util.StaxParserUtil; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.StartElement; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.StartElement; + +import org.keycloak.dom.saml.v2.assertion.AttributeType; +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.util.StaxParserUtil; /** * Parse the in the saml assertion diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeStatementParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeStatementParser.java index 162d7a5a811..fb3273c87e8 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeStatementParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeStatementParser.java @@ -16,12 +16,13 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType.ASTChoiceType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; /** * Parse the in the saml assertion diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeValueParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeValueParser.java index 42b5ac50248..3ee6558e689 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeValueParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAttributeValueParser.java @@ -16,14 +16,25 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import java.io.StringWriter; import java.util.Deque; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.Map; +import java.util.Objects; +import javax.xml.namespace.QName; import javax.xml.stream.XMLEventFactory; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLEventWriter; +import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.EndElement; import javax.xml.stream.events.Namespace; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; + import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; @@ -32,16 +43,6 @@ import org.keycloak.saml.common.parsers.StaxParser; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import java.io.StringWriter; -import java.util.Objects; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLEventWriter; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.EndElement; -import javax.xml.stream.events.StartElement; -import javax.xml.stream.events.XMLEvent; /** * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAudienceRestrictionParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAudienceRestrictionParser.java index a1d5827695e..70762330d30 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAudienceRestrictionParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAudienceRestrictionParser.java @@ -16,13 +16,14 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; -import org.keycloak.dom.saml.v2.assertion.AudienceRestrictionType; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.common.util.StaxParserUtil; import java.net.URI; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; +import org.keycloak.dom.saml.v2.assertion.AudienceRestrictionType; +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.util.StaxParserUtil; + /** * Parse the in the saml assertion * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAuthnContextParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAuthnContextParser.java index 05f3ecfe12e..8d1a6ae3e3d 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAuthnContextParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAuthnContextParser.java @@ -16,15 +16,17 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import java.net.URI; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.AuthnContextClassRefType; import org.keycloak.dom.saml.v2.assertion.AuthnContextDeclRefType; import org.keycloak.dom.saml.v2.assertion.AuthnContextDeclType; import org.keycloak.dom.saml.v2.assertion.AuthnContextType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import java.net.URI; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; + import org.w3c.dom.Element; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAuthnStatementParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAuthnStatementParser.java index 940d005155f..4adf237b93d 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAuthnStatementParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLAuthnStatementParser.java @@ -16,14 +16,15 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; import org.keycloak.dom.saml.v2.assertion.SubjectLocalityType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; /** * Parse the in the saml assertion diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLConditionsParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLConditionsParser.java index db0fda1fe2a..46441eaa61a 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLConditionsParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLConditionsParser.java @@ -16,14 +16,15 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.AudienceRestrictionType; import org.keycloak.dom.saml.v2.assertion.ConditionsType; import org.keycloak.dom.saml.v2.assertion.OneTimeUseType; import org.keycloak.dom.saml.v2.assertion.ProxyRestrictionType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; /** * Parse the in the saml assertion diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLEncryptedAssertionParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLEncryptedAssertionParser.java index c75ec07e713..9fba542b077 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLEncryptedAssertionParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLEncryptedAssertionParser.java @@ -16,11 +16,12 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import javax.xml.stream.XMLEventReader; + import org.keycloak.dom.saml.v2.assertion.EncryptedAssertionType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.parsers.StaxParser; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; public class SAMLEncryptedAssertionParser implements StaxParser { diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLProxyRestrictionParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLProxyRestrictionParser.java index c5b97816af0..be6573e9264 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLProxyRestrictionParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLProxyRestrictionParser.java @@ -1,14 +1,14 @@ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import java.math.BigInteger; +import java.net.URI; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.ProxyRestrictionType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.math.BigInteger; -import java.net.URI; - /** * Parse the tag * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectConfirmationDataParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectConfirmationDataParser.java index 5520921e271..d6970c6629c 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectConfirmationDataParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectConfirmationDataParser.java @@ -16,15 +16,16 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import java.util.Objects; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.SubjectConfirmationDataType; import org.keycloak.dom.xmlsec.w3.xmldsig.KeyInfoType; import org.keycloak.saml.common.constants.WSTrustConstants; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.saml.xmldsig.KeyInfoParser; -import java.util.Objects; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; public class SAMLSubjectConfirmationDataParser extends AbstractStaxSamlAssertionParser { diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectConfirmationParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectConfirmationParser.java index 1480db5e39a..8335d4f4151 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectConfirmationParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectConfirmationParser.java @@ -16,6 +16,9 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.EncryptedElementType; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.assertion.SubjectConfirmationDataType; @@ -24,8 +27,7 @@ import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.parsers.StaxParser; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; + import org.w3c.dom.Element; public class SAMLSubjectConfirmationParser extends AbstractStaxSamlAssertionParser implements StaxParser { diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectParser.java index d158cfac0b1..eac4a3d04f9 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/assertion/SAMLSubjectParser.java @@ -16,6 +16,9 @@ */ package org.keycloak.saml.processing.core.parsers.saml.assertion; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.EncryptedElementType; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.assertion.SubjectType; @@ -23,8 +26,7 @@ import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.parsers.StaxParser; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; + import org.w3c.dom.Element; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/mdui/SAMLUIInfoParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/mdui/SAMLUIInfoParser.java index b623727c6dd..89795a0f769 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/mdui/SAMLUIInfoParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/mdui/SAMLUIInfoParser.java @@ -1,8 +1,9 @@ package org.keycloak.saml.processing.core.parsers.saml.mdui; -import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ATTR_LANG; -import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ATTR_WIDTH; -import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ATTR_HEIGHT; +import java.net.URI; +import java.net.URISyntaxException; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; import org.keycloak.dom.saml.v2.mdui.KeywordsType; import org.keycloak.dom.saml.v2.mdui.LogoType; @@ -14,10 +15,9 @@ import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.saml.metadata.AbstractStaxSamlMetadataParser; import org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.net.URI; -import java.net.URISyntaxException; +import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ATTR_HEIGHT; +import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ATTR_LANG; +import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ATTR_WIDTH; public class SAMLUIInfoParser extends AbstractStaxSamlMetadataParser { diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/AbstractStaxSamlMetadataParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/AbstractStaxSamlMetadataParser.java index 9d9122a8f3b..5a4bc783909 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/AbstractStaxSamlMetadataParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/AbstractStaxSamlMetadataParser.java @@ -1,10 +1,10 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import javax.xml.namespace.QName; + import org.keycloak.saml.common.parsers.AbstractStaxParser; import org.keycloak.saml.processing.core.parsers.util.QNameEnumLookup; -import javax.xml.namespace.QName; - /** * @author mhajas */ diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeAuthorityDescriptorParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeAuthorityDescriptorParser.java index 0a1a83ea321..213a2076acc 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeAuthorityDescriptorParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeAuthorityDescriptorParser.java @@ -1,13 +1,13 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import java.util.List; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.AttributeAuthorityDescriptorType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.util.List; - /** * @author mhajas */ diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeConsumingServiceParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeConsumingServiceParser.java index 7355e0c0a2e..d048c841a2f 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeConsumingServiceParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeConsumingServiceParser.java @@ -1,13 +1,13 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.AttributeConsumingServiceType; import org.keycloak.dom.saml.v2.metadata.LocalizedNameType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ATTR_LANG; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeParser.java index 0b719a292de..9a892c66da0 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAttributeParser.java @@ -16,14 +16,14 @@ */ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAttributeValueParser; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * Parse the in the saml assertion * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAuthnAuthorityDescriptorParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAuthnAuthorityDescriptorParser.java index f67620687e9..2fc8224c537 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAuthnAuthorityDescriptorParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLAuthnAuthorityDescriptorParser.java @@ -1,13 +1,13 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import java.util.List; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.AuthnAuthorityDescriptorType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.util.List; - /** * @author mhajas */ diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLContactPersonParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLContactPersonParser.java index aa16eb336be..140d6313b98 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLContactPersonParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLContactPersonParser.java @@ -1,13 +1,13 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.ContactType; import org.keycloak.dom.saml.v2.metadata.ContactTypeType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ATTR_CONTACT_TYPE; import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.CONTACT_PERSON; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEncryptionMethodParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEncryptionMethodParser.java index 971b6505257..7bbc311b826 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEncryptionMethodParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEncryptionMethodParser.java @@ -1,14 +1,14 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import java.math.BigInteger; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.xmlsec.w3.xmlenc.EncryptionMethodType; import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.math.BigInteger; - import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ENCRYPTION_METHOD; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEndpointTypeParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEndpointTypeParser.java index d0b276ec89d..8ca3a1a2f79 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEndpointTypeParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEndpointTypeParser.java @@ -1,13 +1,13 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import java.net.URI; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.EndpointType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.net.URI; - /** * @author mhajas */ diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java index 56a1c34c002..9431ab22eff 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java @@ -16,13 +16,14 @@ */ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.EntitiesDescriptorType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import org.w3c.dom.Element; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; +import org.w3c.dom.Element; /** * Parse the SAML Entities Descriptor diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java index 8acbb3833bd..b4ff1bd0573 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java @@ -16,6 +16,9 @@ */ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.AttributeAuthorityDescriptorType; import org.keycloak.dom.saml.v2.metadata.AuthnAuthorityDescriptorType; import org.keycloak.dom.saml.v2.metadata.EntityDescriptorType; @@ -25,9 +28,6 @@ import org.keycloak.dom.saml.v2.metadata.SPSSODescriptorType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ENTITY_DESCRIPTOR; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLIDPSSODescriptorParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLIDPSSODescriptorParser.java index f90b7b6129f..58650d83c41 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLIDPSSODescriptorParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLIDPSSODescriptorParser.java @@ -1,13 +1,13 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import java.util.List; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.IDPSSODescriptorType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.util.List; - import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.IDP_SSO_DESCRIPTOR; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLIndexedEndpointTypeParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLIndexedEndpointTypeParser.java index 68b5e170fef..11cf3e1a78d 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLIndexedEndpointTypeParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLIndexedEndpointTypeParser.java @@ -1,13 +1,13 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import java.net.URI; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.IndexedEndpointType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.net.URI; - /** * @author mhajas */ diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLKeyDescriptorParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLKeyDescriptorParser.java index 3e435ff5254..0766505e155 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLKeyDescriptorParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLKeyDescriptorParser.java @@ -1,13 +1,13 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.KeyDescriptorType; import org.keycloak.dom.saml.v2.metadata.KeyTypes; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.KEY_DESCRIPTOR; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLMetadataQNames.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLMetadataQNames.java index 37d9e4d35b7..d2b933a5623 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLMetadataQNames.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLMetadataQNames.java @@ -1,12 +1,12 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import javax.xml.namespace.QName; + import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAssertionQNames; import org.keycloak.saml.processing.core.parsers.saml.xmldsig.XmlDSigQNames; import org.keycloak.saml.processing.core.parsers.util.HasQName; -import javax.xml.namespace.QName; - /** * @author mhajas diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLOrganizationParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLOrganizationParser.java index da3e2277bbe..d57d1e3a715 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLOrganizationParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLOrganizationParser.java @@ -1,15 +1,15 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import java.net.URI; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.LocalizedNameType; import org.keycloak.dom.saml.v2.metadata.LocalizedURIType; import org.keycloak.dom.saml.v2.metadata.OrganizationType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.net.URI; - import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ATTR_LANG; import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.ORGANIZATION; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLPDPDescriptorParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLPDPDescriptorParser.java index 07239e6bb8a..6bce1bf85d4 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLPDPDescriptorParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLPDPDescriptorParser.java @@ -1,13 +1,13 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import java.util.List; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.PDPDescriptorType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.util.List; - /** * @author mhajas */ diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLRequestedAttributeParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLRequestedAttributeParser.java index 77543ebbd5c..46971c9cda7 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLRequestedAttributeParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLRequestedAttributeParser.java @@ -16,15 +16,15 @@ */ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.RequestedAttributeType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAssertionQNames; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAttributeValueParser; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * Parse the in the saml assertion * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLRoleDecriptorTypeParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLRoleDecriptorTypeParser.java index bf7cfc8eba2..5ca83f53a91 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLRoleDecriptorTypeParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLRoleDecriptorTypeParser.java @@ -1,12 +1,13 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.RoleDescriptorType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import org.w3c.dom.Element; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; +import org.w3c.dom.Element; /** * @author mhajas diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLSPSSODescriptorParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLSPSSODescriptorParser.java index 84eeb1a99c9..6e63a5fe917 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLSPSSODescriptorParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLSPSSODescriptorParser.java @@ -1,13 +1,13 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import java.util.List; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.SPSSODescriptorType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.util.List; - import static org.keycloak.saml.processing.core.parsers.saml.metadata.SAMLMetadataQNames.SP_SSO_DESCRIPTOR; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLSSODescriptorTypeParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLSSODescriptorTypeParser.java index 65ca09736ae..92545915b99 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLSSODescriptorTypeParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/metadata/SAMLSSODescriptorTypeParser.java @@ -1,12 +1,12 @@ package org.keycloak.saml.processing.core.parsers.saml.metadata; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.metadata.SSODescriptorType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * @author mhajas */ diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/AbstractStaxSamlProtocolParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/AbstractStaxSamlProtocolParser.java index 5aacd8a107d..0fa18c2b42c 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/AbstractStaxSamlProtocolParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/AbstractStaxSamlProtocolParser.java @@ -16,9 +16,10 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; +import javax.xml.namespace.QName; + import org.keycloak.saml.common.parsers.AbstractStaxParser; import org.keycloak.saml.processing.core.parsers.util.QNameEnumLookup; -import javax.xml.namespace.QName; /** * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLArtifactResolveParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLArtifactResolveParser.java index 00271d0c0f7..b093df78912 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLArtifactResolveParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLArtifactResolveParser.java @@ -16,15 +16,16 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; -import org.keycloak.dom.saml.v2.protocol.ArtifactResolveType; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.common.util.StaxParserUtil; - -import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; -import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; + +import org.keycloak.dom.saml.v2.protocol.ArtifactResolveType; +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.util.StaxParserUtil; +import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; +import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; + import static org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLRequestAbstractParser.VERSION_2_0; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLArtifactResponseParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLArtifactResponseParser.java index 4ac79f92b46..ee9e24acdb3 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLArtifactResponseParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLArtifactResponseParser.java @@ -16,16 +16,18 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.protocol.ArtifactResponseType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import javax.xml.datatype.XMLGregorianCalendar; + import org.w3c.dom.Element; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; import static org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLStatusResponseTypeParser.VERSION_2_0; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLAttributeQueryParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLAttributeQueryParser.java index c255cb34f93..af6cd71a4f8 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLAttributeQueryParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLAttributeQueryParser.java @@ -16,18 +16,19 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; -import org.keycloak.dom.saml.v2.protocol.AttributeQueryType; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.common.util.StaxParserUtil; - +import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; + +import org.keycloak.dom.saml.v2.protocol.AttributeQueryType; +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.parsers.StaxParser; +import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAttributeParser; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLSubjectParser; -import org.keycloak.saml.common.parsers.StaxParser; import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import javax.xml.datatype.XMLGregorianCalendar; + import static org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLRequestAbstractParser.VERSION_2_0; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLAuthNRequestParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLAuthNRequestParser.java index 592cc503ffb..3720b208e1b 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLAuthNRequestParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLAuthNRequestParser.java @@ -16,18 +16,19 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.dom.saml.v2.protocol.NameIDPolicyType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; - -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLConditionsParser; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLSubjectParser; import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import javax.xml.datatype.XMLGregorianCalendar; + import static org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLRequestAbstractParser.VERSION_2_0; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLExtensionsParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLExtensionsParser.java index 0a72ddac9d0..978601f1ab8 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLExtensionsParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLExtensionsParser.java @@ -18,6 +18,7 @@ package org.keycloak.saml.processing.core.parsers.saml.protocol; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.protocol.ExtensionsType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLProtocolQNames.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLProtocolQNames.java index c071eb7f996..d0fbf6d09c7 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLProtocolQNames.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLProtocolQNames.java @@ -16,10 +16,11 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; +import javax.xml.namespace.QName; + import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAssertionQNames; import org.keycloak.saml.processing.core.parsers.saml.xmldsig.XmlDSigQNames; -import javax.xml.namespace.QName; import org.keycloak.saml.processing.core.parsers.util.HasQName; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLRequestAbstractParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLRequestAbstractParser.java index a714fff0a52..9425f6d36f9 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLRequestAbstractParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLRequestAbstractParser.java @@ -16,12 +16,13 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.protocol.RequestAbstractType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; /** * Base Class for SAML Request Parsing diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLRequestedAuthnContextParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLRequestedAuthnContextParser.java index 550612b67d8..6d328fa9ad4 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLRequestedAuthnContextParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLRequestedAuthnContextParser.java @@ -16,15 +16,15 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.protocol.AuthnContextComparisonType; import org.keycloak.dom.saml.v2.protocol.RequestedAuthnContextType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.StartElement; - /** * Parse the SAML2 RequestedAuthnContext * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLResponseParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLResponseParser.java index 5a30e9b3712..84678a11f0a 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLResponseParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLResponseParser.java @@ -16,19 +16,20 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.dom.saml.v2.protocol.ResponseType.RTChoiceType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; -import org.w3c.dom.Element; - -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAssertionParser; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLEncryptedAssertionParser; +import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import javax.xml.datatype.XMLGregorianCalendar; + +import org.w3c.dom.Element; /** * Parse the SAML Response diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLSloRequestParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLSloRequestParser.java index d1da7cf93bc..c2b3fc9db5f 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLSloRequestParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLSloRequestParser.java @@ -16,18 +16,20 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.EncryptedElementType; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; - import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; + import org.w3c.dom.Element; + import static org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLRequestAbstractParser.VERSION_2_0; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLSloResponseParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLSloResponseParser.java index 7366a9fee27..d46ae79a15f 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLSloResponseParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLSloResponseParser.java @@ -16,17 +16,18 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; -import org.keycloak.dom.saml.v2.protocol.StatusResponseType; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.common.util.StaxParserUtil; - -import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; -import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.stream.XMLEventReader; import javax.xml.stream.events.StartElement; +import org.keycloak.dom.saml.v2.protocol.StatusResponseType; +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.util.StaxParserUtil; +import org.keycloak.saml.processing.core.parsers.util.SAMLParserUtil; +import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; + import org.w3c.dom.Element; + import static org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLStatusResponseTypeParser.VERSION_2_0; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusCodeParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusCodeParser.java index b471381e62b..70bf65c1fc1 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusCodeParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusCodeParser.java @@ -16,11 +16,12 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.protocol.StatusCodeType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; /** * Base Class for all Response Type parsing for SAML2 diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusParser.java index c44993cb354..9e10aba5496 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusParser.java @@ -16,16 +16,17 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; +import java.util.List; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.protocol.StatusDetailType; import org.keycloak.dom.saml.v2.protocol.StatusType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.parsers.AnyDomParser; import org.keycloak.saml.common.util.StaxParserUtil; -import org.w3c.dom.Element; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; -import java.util.List; +import org.w3c.dom.Element; /** * Base Class for all Response Type parsing for SAML2 diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusResponseTypeParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusResponseTypeParser.java index dfc34a72ca0..89739ef208f 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusResponseTypeParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/protocol/SAMLStatusResponseTypeParser.java @@ -16,10 +16,11 @@ */ package org.keycloak.saml.processing.core.parsers.saml.protocol; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.protocol.StatusResponseType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.events.StartElement; /** * Base Class for all Response Type parsing for SAML2 diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/AbstractStaxXmlDSigParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/AbstractStaxXmlDSigParser.java index 0d691d9a5b3..f6598d4cf46 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/AbstractStaxXmlDSigParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/AbstractStaxXmlDSigParser.java @@ -16,9 +16,10 @@ */ package org.keycloak.saml.processing.core.parsers.saml.xmldsig; +import javax.xml.namespace.QName; + import org.keycloak.saml.common.parsers.AbstractStaxParser; import org.keycloak.saml.processing.core.parsers.util.QNameEnumLookup; -import javax.xml.namespace.QName; /** * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/DsaKeyValueParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/DsaKeyValueParser.java index 4c4c48c92e8..b5d9983fab9 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/DsaKeyValueParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/DsaKeyValueParser.java @@ -16,14 +16,14 @@ */ package org.keycloak.saml.processing.core.parsers.saml.xmldsig; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.xmlsec.w3.xmldsig.DSAKeyValueType; import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - public class DsaKeyValueParser extends AbstractStaxXmlDSigParser { public static final DsaKeyValueParser INSTANCE = new DsaKeyValueParser(); diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/KeyInfoParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/KeyInfoParser.java index ee2dd347dcf..55c918c05fd 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/KeyInfoParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/KeyInfoParser.java @@ -16,14 +16,14 @@ */ package org.keycloak.saml.processing.core.parsers.saml.xmldsig; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.xmlsec.w3.xmldsig.KeyInfoType; import org.keycloak.dom.xmlsec.w3.xmldsig.KeyValueType; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - public class KeyInfoParser extends AbstractStaxXmlDSigParser { public static final KeyInfoParser INSTANCE = new KeyInfoParser(); diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/RsaKeyValueParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/RsaKeyValueParser.java index fbb8b13c180..9d5f63d61b0 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/RsaKeyValueParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/RsaKeyValueParser.java @@ -16,14 +16,14 @@ */ package org.keycloak.saml.processing.core.parsers.saml.xmldsig; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.xmlsec.w3.xmldsig.RSAKeyValueType; import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - public class RsaKeyValueParser extends AbstractStaxXmlDSigParser { public static final RsaKeyValueParser INSTANCE = new RsaKeyValueParser(); diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/X509DataParser.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/X509DataParser.java index bbd339bbed1..596404464a0 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/X509DataParser.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/X509DataParser.java @@ -16,15 +16,15 @@ */ package org.keycloak.saml.processing.core.parsers.saml.xmldsig; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.xmlsec.w3.xmldsig.X509CertificateType; import org.keycloak.dom.xmlsec.w3.xmldsig.X509DataType; import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; - /** * Base Class for all Response Type parsing for SAML2 * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/XmlDSigQNames.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/XmlDSigQNames.java index 32f2d37a633..2f7f38e9f09 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/XmlDSigQNames.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/saml/xmldsig/XmlDSigQNames.java @@ -16,8 +16,9 @@ */ package org.keycloak.saml.processing.core.parsers.saml.xmldsig; -import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import javax.xml.namespace.QName; + +import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.parsers.util.HasQName; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/util/SAML11ParserUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/util/SAML11ParserUtil.java index 56e7ca9a352..e2f617d317f 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/util/SAML11ParserUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/util/SAML11ParserUtil.java @@ -16,6 +16,14 @@ */ package org.keycloak.saml.processing.core.parsers.util; +import java.net.URI; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.EndElement; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; + import org.keycloak.dom.saml.v1.assertion.SAML11ActionType; import org.keycloak.dom.saml.v1.assertion.SAML11AttributeStatementType; import org.keycloak.dom.saml.v1.assertion.SAML11AttributeType; @@ -52,14 +60,6 @@ import org.keycloak.saml.processing.core.saml.v1.SAML11Constants; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; import org.w3c.dom.Element; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.EndElement; -import javax.xml.stream.events.StartElement; -import javax.xml.stream.events.XMLEvent; -import java.net.URI; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/util/SAMLParserUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/util/SAMLParserUtil.java index c3b44bcfdd9..31856d04709 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/util/SAMLParserUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/parsers/util/SAMLParserUtil.java @@ -15,16 +15,16 @@ * limitations under the License. */ package org.keycloak.saml.processing.core.parsers.util; +import java.util.Objects; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.StaxParserUtil; - import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAssertionQNames; -import java.util.Objects; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.events.StartElement; /** * Utility methods for SAML Parser diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/BaseSAML11Writer.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/BaseSAML11Writer.java index 9f5ce463a9c..32132c4fd8c 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/BaseSAML11Writer.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/BaseSAML11Writer.java @@ -16,11 +16,11 @@ */ package org.keycloak.saml.processing.core.saml.v1.writers; +import javax.xml.stream.XMLStreamWriter; + import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; -import javax.xml.stream.XMLStreamWriter; - /** * @author Anil.Saldhana@redhat.com * @since Jun 27, 2011 diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11AssertionWriter.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11AssertionWriter.java index c6105c43f43..6eebdf470e5 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11AssertionWriter.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11AssertionWriter.java @@ -16,6 +16,12 @@ */ package org.keycloak.saml.processing.core.saml.v1.writers; +import java.net.URI; +import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamWriter; + import org.keycloak.dom.saml.v1.assertion.SAML11ActionType; import org.keycloak.dom.saml.v1.assertion.SAML11AdviceType; import org.keycloak.dom.saml.v1.assertion.SAML11AssertionType; @@ -43,13 +49,8 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.common.util.StringUtil; import org.keycloak.saml.processing.core.saml.v1.SAML11Constants; -import org.w3c.dom.Element; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamWriter; -import java.net.URI; -import java.util.List; +import org.w3c.dom.Element; /** * Write the SAML 11 Assertion to stream diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11RequestWriter.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11RequestWriter.java index 80f4e375b4c..4622d636a51 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11RequestWriter.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11RequestWriter.java @@ -16,6 +16,10 @@ */ package org.keycloak.saml.processing.core.saml.v1.writers; +import java.net.URI; +import java.util.List; +import javax.xml.stream.XMLStreamWriter; + import org.keycloak.dom.saml.v1.assertion.SAML11ActionType; import org.keycloak.dom.saml.v1.assertion.SAML11AttributeDesignatorType; import org.keycloak.dom.saml.v1.assertion.SAML11AttributeType; @@ -31,10 +35,6 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.processing.core.saml.v1.SAML11Constants; -import javax.xml.stream.XMLStreamWriter; -import java.net.URI; -import java.util.List; - /** * Write the {@link org.keycloak.dom.saml.v1.protocol.SAML11RequestType} to stream * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11ResponseWriter.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11ResponseWriter.java index 66fbb5324f2..062bfb1e598 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11ResponseWriter.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v1/writers/SAML11ResponseWriter.java @@ -16,6 +16,11 @@ */ package org.keycloak.saml.processing.core.saml.v1.writers; +import java.net.URI; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamWriter; + import org.keycloak.dom.saml.common.CommonStatusDetailType; import org.keycloak.dom.saml.v1.assertion.SAML11AssertionType; import org.keycloak.dom.saml.v1.protocol.SAML11ResponseType; @@ -26,12 +31,8 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.common.util.StringUtil; import org.keycloak.saml.processing.core.saml.v1.SAML11Constants; -import org.w3c.dom.Element; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamWriter; -import java.net.URI; -import java.util.List; +import org.w3c.dom.Element; /** * Write the {@link SAML11ResponseType} to stream diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/common/IDGenerator.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/common/IDGenerator.java index 60f248183c7..cfddba5ce76 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/common/IDGenerator.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/common/IDGenerator.java @@ -16,11 +16,11 @@ */ package org.keycloak.saml.processing.core.saml.v2.common; +import java.util.UUID; + import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; -import java.util.UUID; - /** * Utility class that generates unique IDs * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/common/SAMLDocumentHolder.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/common/SAMLDocumentHolder.java index 16ecdfe0149..007fed5922a 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/common/SAMLDocumentHolder.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/common/SAMLDocumentHolder.java @@ -17,6 +17,7 @@ package org.keycloak.saml.processing.core.saml.v2.common; import org.keycloak.dom.saml.v2.SAML2Object; + import org.w3c.dom.Document; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/constants/X500SAMLProfileConstants.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/constants/X500SAMLProfileConstants.java index 25ffd992cda..d6cb9a41a6b 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/constants/X500SAMLProfileConstants.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/constants/X500SAMLProfileConstants.java @@ -16,13 +16,13 @@ */ package org.keycloak.saml.processing.core.saml.v2.constants; -import org.keycloak.dom.saml.v2.assertion.AttributeType; - import java.util.EnumSet; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import org.keycloak.dom.saml.v2.assertion.AttributeType; + /** * X500 SAML Profile Constants Adapted from * http://code.google.com/p/simplesamlphp/source/browse/trunk/attributemap/name2oid.php?r=2654 diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java index 45fee0211ed..c37f47e1f5f 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java @@ -16,6 +16,9 @@ */ package org.keycloak.saml.processing.core.saml.v2.factories; +import java.net.URI; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.EncryptedAssertionType; import org.keycloak.dom.saml.v2.assertion.NameIDType; @@ -29,10 +32,8 @@ import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.common.exceptions.ConfigurationException; import org.keycloak.saml.processing.core.saml.v2.holders.IssuerInfoHolder; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import org.w3c.dom.Element; -import javax.xml.datatype.XMLGregorianCalendar; -import java.net.URI; +import org.w3c.dom.Element; /** * Factory for the SAML v2 Authn Response diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/factories/SAMLAssertionFactory.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/factories/SAMLAssertionFactory.java index 16abc2a5844..89a548d1757 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/factories/SAMLAssertionFactory.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/factories/SAMLAssertionFactory.java @@ -16,6 +16,10 @@ */ package org.keycloak.saml.processing.core.saml.v2.factories; +import java.net.URI; +import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AudienceRestrictionType; import org.keycloak.dom.saml.v2.assertion.ConditionAbstractType; @@ -27,10 +31,6 @@ import org.keycloak.dom.saml.v2.assertion.SubjectConfirmationType; import org.keycloak.dom.saml.v2.assertion.SubjectType; import org.keycloak.dom.xmlsec.w3.xmldsig.KeyInfoType; -import javax.xml.datatype.XMLGregorianCalendar; -import java.net.URI; -import java.util.List; - /** * Deal with {@code AssertionType} * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/ArtifactResponseUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/ArtifactResponseUtil.java index d274f84237a..a934751acf6 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/ArtifactResponseUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/ArtifactResponseUtil.java @@ -17,20 +17,21 @@ package org.keycloak.saml.processing.core.saml.v2.util; +import java.io.StringWriter; +import java.util.Optional; +import javax.xml.transform.TransformerException; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + import org.keycloak.saml.common.constants.JBossSAMLConstants; import org.keycloak.saml.common.exceptions.ConfigurationException; import org.keycloak.saml.common.util.TransformerUtil; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import javax.xml.transform.TransformerException; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; -import java.io.StringWriter; -import java.util.Optional; - /** * Utility class to manipulate SAML ArtifactResponse and embedded Response. * @author Thibault Morin (https://tmorin.github.io) diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/AssertionUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/AssertionUtil.java index a65b9584e95..671089ab8c1 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/AssertionUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/AssertionUtil.java @@ -16,6 +16,18 @@ */ package org.keycloak.saml.processing.core.saml.v2.util; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.stream.XMLEventReader; + import org.keycloak.dom.saml.v1.assertion.SAML11AssertionType; import org.keycloak.dom.saml.v1.assertion.SAML11AttributeStatementType; import org.keycloak.dom.saml.v1.assertion.SAML11AttributeType; @@ -55,23 +67,11 @@ import org.keycloak.saml.processing.core.saml.v2.writers.SAMLAssertionWriter; import org.keycloak.saml.processing.core.util.JAXPValidationUtil; import org.keycloak.saml.processing.core.util.XMLEncryptionUtil; import org.keycloak.saml.processing.core.util.XMLSignatureUtil; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.stream.XMLEventReader; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.Set; - /** * Utility to deal with assertions * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SAMLMetadataUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SAMLMetadataUtil.java index ef6e76de00e..015cfac45f6 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SAMLMetadataUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SAMLMetadataUtil.java @@ -22,6 +22,7 @@ import java.security.cert.X509Certificate; import java.util.List; import java.util.function.Function; import javax.xml.crypto.dsig.CanonicalizationMethod; + import org.keycloak.dom.saml.v2.metadata.EntitiesDescriptorType; import org.keycloak.dom.saml.v2.metadata.EntityDescriptorType; import org.keycloak.dom.saml.v2.metadata.IDPSSODescriptorType; @@ -41,6 +42,7 @@ import org.keycloak.saml.processing.core.parsers.saml.SAMLParser; import org.keycloak.saml.processing.core.saml.v2.common.IDGenerator; import org.keycloak.saml.processing.core.saml.v2.writers.SAMLMetadataWriter; import org.keycloak.saml.processing.core.util.XMLSignatureUtil; + import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SignatureUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SignatureUtil.java index 0d477dc5a8f..0fa509623ab 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SignatureUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/SignatureUtil.java @@ -16,6 +16,18 @@ */ package org.keycloak.saml.processing.core.saml.v2.util; +import java.io.OutputStream; +import java.security.GeneralSecurityException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.Signature; +import java.security.cert.X509Certificate; +import java.security.interfaces.DSAPublicKey; +import java.security.interfaces.RSAPublicKey; +import java.util.Base64; + +import jakarta.xml.bind.JAXBException; + import org.keycloak.dom.xmlsec.w3.xmldsig.DSAKeyValueType; import org.keycloak.dom.xmlsec.w3.xmldsig.KeyValueType; import org.keycloak.dom.xmlsec.w3.xmldsig.RSAKeyValueType; @@ -28,17 +40,6 @@ import org.keycloak.saml.processing.core.constants.PicketLinkFederationConstants import org.xml.sax.SAXException; -import jakarta.xml.bind.JAXBException; -import java.io.OutputStream; -import java.security.GeneralSecurityException; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.Signature; -import java.security.cert.X509Certificate; -import java.security.interfaces.DSAPublicKey; -import java.security.interfaces.RSAPublicKey; -import java.util.Base64; - /** * Signature utility for signing content * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/StatementUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/StatementUtil.java index 32f9cd5c3f6..d49ba552134 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/StatementUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/StatementUtil.java @@ -16,6 +16,17 @@ */ package org.keycloak.saml.processing.core.saml.v2.util; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; + import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType.ASTChoiceType; import org.keycloak.dom.saml.v2.assertion.AttributeType; @@ -28,17 +39,6 @@ import org.keycloak.saml.common.util.StringUtil; import org.keycloak.saml.processing.core.constants.AttributeConstants; import org.keycloak.saml.processing.core.saml.v2.constants.X500SAMLProfileConstants; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Deals with SAML2 Statements * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/StaxWriterUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/StaxWriterUtil.java index 3473743e0b2..134717a2983 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/StaxWriterUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/StaxWriterUtil.java @@ -18,6 +18,8 @@ package org.keycloak.saml.processing.core.saml.v2.util; +import javax.xml.stream.XMLStreamWriter; + import org.keycloak.dom.xmlsec.w3.xmldsig.DSAKeyValueType; import org.keycloak.dom.xmlsec.w3.xmldsig.KeyInfoType; import org.keycloak.dom.xmlsec.w3.xmldsig.KeyValueType; @@ -34,8 +36,6 @@ import org.keycloak.saml.common.util.StaxUtil; import org.w3c.dom.Element; -import javax.xml.stream.XMLStreamWriter; - /** * Utility methods for stax writing * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/XMLTimeUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/XMLTimeUtil.java index 332d2c3c558..f504be26371 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/XMLTimeUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/util/XMLTimeUtil.java @@ -16,21 +16,21 @@ */ package org.keycloak.saml.processing.core.saml.v2.util; -import org.keycloak.saml.common.PicketLinkLogger; -import org.keycloak.saml.common.PicketLinkLoggerFactory; -import org.keycloak.saml.common.constants.GeneralConstants; -import org.keycloak.saml.common.util.SecurityActions; -import org.keycloak.saml.common.util.SystemPropertiesUtil; -import org.keycloak.common.util.Time; - +import java.util.GregorianCalendar; +import java.util.TimeZone; +import java.util.concurrent.TimeUnit; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; -import java.util.GregorianCalendar; -import java.util.TimeZone; -import java.util.concurrent.TimeUnit; + +import org.keycloak.common.util.Time; +import org.keycloak.saml.common.PicketLinkLogger; +import org.keycloak.saml.common.PicketLinkLoggerFactory; +import org.keycloak.saml.common.constants.GeneralConstants; +import org.keycloak.saml.common.util.SecurityActions; +import org.keycloak.saml.common.util.SystemPropertiesUtil; /** * Util class dealing with xml based time diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/BaseWriter.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/BaseWriter.java index b44f10d42ab..4281e5b3a57 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/BaseWriter.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/BaseWriter.java @@ -16,6 +16,14 @@ */ package org.keycloak.saml.processing.core.saml.v2.writers; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamWriter; + import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.dom.saml.v2.assertion.BaseIDAbstractType; import org.keycloak.dom.saml.v2.assertion.EncryptedElementType; @@ -25,7 +33,9 @@ import org.keycloak.dom.saml.v2.assertion.SubjectConfirmationDataType; import org.keycloak.dom.saml.v2.assertion.SubjectConfirmationType; import org.keycloak.dom.saml.v2.assertion.SubjectType; import org.keycloak.dom.saml.v2.metadata.LocalizedNameType; +import org.keycloak.dom.saml.v2.protocol.ExtensionsType; import org.keycloak.dom.xmlsec.w3.xmldsig.KeyInfoType; +import org.keycloak.saml.SamlProtocolExtensionsAwareBuilder; import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; import org.keycloak.saml.common.constants.JBossSAMLConstants; @@ -35,22 +45,12 @@ import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.common.util.StringUtil; import org.keycloak.saml.processing.core.saml.v2.util.StaxWriterUtil; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamWriter; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import org.keycloak.dom.saml.v2.protocol.ExtensionsType; -import org.keycloak.saml.SamlProtocolExtensionsAwareBuilder; +import org.w3c.dom.Element; +import org.w3c.dom.Node; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ASSERTION_NSURI; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.PROTOCOL_NSURI; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - /** * Base Class for the Stax writers for SAML * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLAssertionWriter.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLAssertionWriter.java index 6b98b34fc93..6d7d73627b4 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLAssertionWriter.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLAssertionWriter.java @@ -16,6 +16,13 @@ */ package org.keycloak.saml.processing.core.saml.v2.writers; +import java.net.URI; +import java.util.List; +import java.util.Set; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamWriter; + import org.keycloak.dom.saml.v2.assertion.AdviceType; import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; @@ -40,13 +47,6 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAssertionQNames; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamWriter; -import java.net.URI; -import java.util.List; -import java.util.Set; - import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ASSERTION_NSURI; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLMetadataWriter.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLMetadataWriter.java index 23c4191bd8f..884c9b82ce3 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLMetadataWriter.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLMetadataWriter.java @@ -16,6 +16,11 @@ */ package org.keycloak.saml.processing.core.saml.v2.writers; +import java.net.URI; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamWriter; + import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.dom.saml.v2.metadata.AdditionalMetadataLocationType; import org.keycloak.dom.saml.v2.metadata.AffiliationDescriptorType; @@ -45,12 +50,8 @@ import org.keycloak.saml.common.constants.JBossSAMLConstants; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.StaxUtil; -import org.w3c.dom.Element; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamWriter; -import java.net.URI; -import java.util.List; +import org.w3c.dom.Element; /** * Write the SAML metadata elements diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLRequestWriter.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLRequestWriter.java index 9f13d6535a0..20318113cb9 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLRequestWriter.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLRequestWriter.java @@ -16,6 +16,11 @@ */ package org.keycloak.saml.processing.core.saml.v2.writers; +import java.net.URI; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamWriter; + import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.assertion.SubjectType; @@ -23,6 +28,7 @@ import org.keycloak.dom.saml.v2.protocol.ArtifactResolveType; import org.keycloak.dom.saml.v2.protocol.AttributeQueryType; import org.keycloak.dom.saml.v2.protocol.AuthnContextComparisonType; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; +import org.keycloak.dom.saml.v2.protocol.ExtensionsType; import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; import org.keycloak.dom.saml.v2.protocol.NameIDPolicyType; import org.keycloak.dom.saml.v2.protocol.RequestedAuthnContextType; @@ -30,13 +36,8 @@ import org.keycloak.saml.common.constants.JBossSAMLConstants; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.common.util.StringUtil; -import org.w3c.dom.Element; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamWriter; -import java.net.URI; -import java.util.List; -import org.keycloak.dom.saml.v2.protocol.ExtensionsType; +import org.w3c.dom.Element; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ASSERTION_NSURI; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.NAMEID_FORMAT_TRANSIENT; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLResponseWriter.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLResponseWriter.java index f624dc515d2..b93762dd6a2 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLResponseWriter.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLResponseWriter.java @@ -16,11 +16,17 @@ */ package org.keycloak.saml.processing.core.saml.v2.writers; +import java.net.URI; +import java.util.List; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamWriter; + import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.EncryptedAssertionType; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.ArtifactResponseType; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; +import org.keycloak.dom.saml.v2.protocol.ExtensionsType; import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.dom.saml.v2.protocol.StatusCodeType; @@ -32,13 +38,8 @@ import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.common.util.StringUtil; -import org.w3c.dom.Element; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLStreamWriter; -import java.net.URI; -import java.util.List; -import org.keycloak.dom.saml.v2.protocol.ExtensionsType; +import org.w3c.dom.Element; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.PROTOCOL_NSURI; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/IDFedLSInputResolver.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/IDFedLSInputResolver.java index 5108657597d..cb208820d15 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/IDFedLSInputResolver.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/IDFedLSInputResolver.java @@ -16,7 +16,6 @@ */ package org.keycloak.saml.processing.core.util; -import org.keycloak.saml.common.util.SecurityActions; import java.io.IOException; import java.io.InputStream; import java.io.Reader; @@ -27,6 +26,8 @@ import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; +import org.keycloak.saml.common.util.SecurityActions; + import org.jboss.logging.Logger; import org.w3c.dom.ls.LSInput; import org.w3c.dom.ls.LSResourceResolver; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXBUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXBUtil.java index 0da98cde547..b8af8d60fda 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXBUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXBUtil.java @@ -16,26 +16,27 @@ */ package org.keycloak.saml.processing.core.util; -import org.keycloak.saml.common.PicketLinkLogger; -import org.keycloak.saml.common.PicketLinkLoggerFactory; -import org.keycloak.saml.common.constants.GeneralConstants; - -import org.keycloak.saml.common.util.SecurityActions; -import org.xml.sax.ErrorHandler; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; +import java.io.IOException; +import java.net.URL; +import java.util.HashMap; +import javax.xml.transform.Source; +import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; import jakarta.xml.bind.JAXBContext; import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Marshaller; import jakarta.xml.bind.Unmarshaller; -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; -import java.io.IOException; -import java.net.URL; -import java.util.HashMap; + +import org.keycloak.saml.common.PicketLinkLogger; +import org.keycloak.saml.common.PicketLinkLoggerFactory; +import org.keycloak.saml.common.constants.GeneralConstants; +import org.keycloak.saml.common.util.SecurityActions; + +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; /** * Utility to obtain JAXB2 marshaller/unmarshaller etc diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXPValidationUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXPValidationUtil.java index ba1ec9ddc8f..fcb03436e69 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXPValidationUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/JAXPValidationUtil.java @@ -16,6 +16,19 @@ */ package org.keycloak.saml.processing.core.util; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.List; +import javax.xml.XMLConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.transform.Source; +import javax.xml.transform.stax.StAXSource; +import javax.xml.transform.stream.StreamSource; +import javax.xml.validation.Schema; +import javax.xml.validation.SchemaFactory; +import javax.xml.validation.Validator; + import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; import org.keycloak.saml.common.constants.GeneralConstants; @@ -24,25 +37,14 @@ import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.common.util.SecurityActions; import org.keycloak.saml.common.util.StaxParserUtil; import org.keycloak.saml.common.util.SystemPropertiesUtil; + import org.w3c.dom.Node; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; - -import javax.xml.transform.Source; -import javax.xml.transform.stream.StreamSource; -import javax.xml.validation.Schema; -import javax.xml.validation.SchemaFactory; -import javax.xml.validation.Validator; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.List; -import javax.xml.XMLConstants; -import javax.xml.stream.XMLStreamException; -import javax.xml.transform.stax.StAXSource; import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotSupportedException; +import org.xml.sax.SAXParseException; + import static org.keycloak.saml.common.util.DocumentUtil.feature_disallow_doctype_decl; import static org.keycloak.saml.common.util.DocumentUtil.feature_external_general_entities; import static org.keycloak.saml.common.util.DocumentUtil.feature_external_parameter_entities; diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/KeycloakKeySamlExtensionGenerator.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/KeycloakKeySamlExtensionGenerator.java index 1bb90ea9b4f..cdfd4b65f9b 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/KeycloakKeySamlExtensionGenerator.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/KeycloakKeySamlExtensionGenerator.java @@ -19,9 +19,11 @@ package org.keycloak.saml.processing.core.util; import java.util.Objects; import javax.xml.stream.XMLStreamWriter; + import org.keycloak.saml.SamlProtocolExtensionsAwareBuilder; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.StaxUtil; + import org.w3c.dom.Element; /** diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/RedirectBindingSignatureUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/RedirectBindingSignatureUtil.java index 895f697ed2d..3e00ad5b54f 100644 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/RedirectBindingSignatureUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/RedirectBindingSignatureUtil.java @@ -22,11 +22,13 @@ import java.security.KeyManagementException; import java.security.PublicKey; import java.security.Signature; import java.security.SignatureException; -import org.jboss.logging.Logger; + import org.keycloak.common.VerificationException; import org.keycloak.rotation.KeyLocator; import org.keycloak.saml.SignatureAlgorithm; +import org.jboss.logging.Logger; + /** * * @author rmartinc diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/SignatureUtilTransferObject.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/SignatureUtilTransferObject.java index c9dd5bd272a..cc6eae1f7fa 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/SignatureUtilTransferObject.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/SignatureUtilTransferObject.java @@ -16,12 +16,12 @@ */ package org.keycloak.saml.processing.core.util; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - import java.security.KeyPair; import java.security.cert.X509Certificate; +import org.w3c.dom.Document; +import org.w3c.dom.Node; + /** * A Transfer Object used by {@link XMLSignatureUtil} * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLEncryptionUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLEncryptionUtil.java index 81582071446..ec9e9f5e29a 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLEncryptionUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLEncryptionUtil.java @@ -16,13 +16,14 @@ */ package org.keycloak.saml.processing.core.util; -import org.apache.xml.security.algorithms.JCEMapper; -import org.apache.xml.security.encryption.EncryptedData; -import org.apache.xml.security.encryption.EncryptedKey; -import org.apache.xml.security.encryption.XMLCipher; -import org.apache.xml.security.encryption.XMLEncryptionException; -import org.apache.xml.security.exceptions.XMLSecurityException; -import org.apache.xml.security.utils.EncryptionConstants; +import java.security.Key; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.util.List; +import javax.crypto.SecretKey; +import javax.xml.XMLConstants; +import javax.xml.crypto.dsig.XMLSignature; +import javax.xml.namespace.QName; import org.keycloak.saml.common.PicketLinkLogger; import org.keycloak.saml.common.PicketLinkLoggerFactory; @@ -30,20 +31,18 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.common.util.StringUtil; +import org.apache.xml.security.algorithms.JCEMapper; +import org.apache.xml.security.encryption.EncryptedData; +import org.apache.xml.security.encryption.EncryptedKey; +import org.apache.xml.security.encryption.XMLCipher; +import org.apache.xml.security.encryption.XMLEncryptionException; +import org.apache.xml.security.exceptions.XMLSecurityException; +import org.apache.xml.security.utils.EncryptionConstants; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import javax.crypto.SecretKey; -import javax.xml.namespace.QName; -import java.security.Key; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.util.List; -import javax.xml.XMLConstants; -import javax.xml.crypto.dsig.XMLSignature; - /** * Utility for XML Encryption Note: This utility is currently using Apache XML Security library API. JSR-106 is * not yet diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLSignatureUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLSignatureUtil.java index 6c1b48940f8..973ead7dee9 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLSignatureUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/core/util/XMLSignatureUtil.java @@ -16,54 +16,6 @@ */ package org.keycloak.saml.processing.core.util; -import org.keycloak.common.util.PemUtils; -import org.keycloak.dom.xmlsec.w3.xmldsig.DSAKeyValueType; -import org.keycloak.dom.xmlsec.w3.xmldsig.KeyValueType; -import org.keycloak.dom.xmlsec.w3.xmldsig.RSAKeyValueType; -import org.keycloak.dom.xmlsec.w3.xmldsig.SignatureType; -import org.keycloak.saml.common.PicketLinkLogger; -import org.keycloak.saml.common.PicketLinkLoggerFactory; -import org.keycloak.saml.common.constants.GeneralConstants; -import org.keycloak.saml.common.constants.JBossSAMLConstants; -import org.keycloak.saml.common.constants.WSTrustConstants; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.common.exceptions.ProcessingException; -import org.keycloak.saml.common.util.DocumentUtil; -import org.keycloak.saml.common.util.StringUtil; -import org.keycloak.saml.common.util.SystemPropertiesUtil; -import org.keycloak.saml.common.util.TransformerUtil; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; - -import jakarta.xml.bind.JAXBException; -import javax.xml.crypto.XMLStructure; -import javax.xml.crypto.MarshalException; -import javax.xml.crypto.dsig.CanonicalizationMethod; -import javax.xml.crypto.dsig.DigestMethod; -import javax.xml.crypto.dsig.Reference; -import javax.xml.crypto.dsig.SignatureMethod; -import javax.xml.crypto.dsig.SignedInfo; -import javax.xml.crypto.dsig.Transform; -import javax.xml.crypto.dsig.XMLSignature; -import javax.xml.crypto.dsig.XMLSignatureException; -import javax.xml.crypto.dsig.XMLSignatureFactory; -import javax.xml.crypto.dsig.dom.DOMSignContext; -import javax.xml.crypto.dsig.dom.DOMValidateContext; -import javax.xml.crypto.dsig.keyinfo.KeyInfo; -import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory; -import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec; -import javax.xml.crypto.dsig.spec.TransformParameterSpec; -import javax.xml.namespace.QName; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.stream.StreamResult; import java.io.ByteArrayInputStream; import java.io.OutputStream; import java.security.GeneralSecurityException; @@ -91,13 +43,63 @@ import javax.xml.crypto.Data; import javax.xml.crypto.KeySelector; import javax.xml.crypto.KeySelectorException; import javax.xml.crypto.KeySelectorResult; +import javax.xml.crypto.MarshalException; import javax.xml.crypto.NodeSetData; import javax.xml.crypto.URIReferenceException; import javax.xml.crypto.XMLCryptoContext; +import javax.xml.crypto.XMLStructure; import javax.xml.crypto.dom.DOMStructure; +import javax.xml.crypto.dsig.CanonicalizationMethod; +import javax.xml.crypto.dsig.DigestMethod; +import javax.xml.crypto.dsig.Reference; +import javax.xml.crypto.dsig.SignatureMethod; +import javax.xml.crypto.dsig.SignedInfo; +import javax.xml.crypto.dsig.Transform; +import javax.xml.crypto.dsig.XMLSignature; +import javax.xml.crypto.dsig.XMLSignatureException; +import javax.xml.crypto.dsig.XMLSignatureFactory; +import javax.xml.crypto.dsig.dom.DOMSignContext; +import javax.xml.crypto.dsig.dom.DOMValidateContext; +import javax.xml.crypto.dsig.keyinfo.KeyInfo; +import javax.xml.crypto.dsig.keyinfo.KeyInfoFactory; +import javax.xml.crypto.dsig.spec.C14NMethodParameterSpec; +import javax.xml.crypto.dsig.spec.TransformParameterSpec; +import javax.xml.namespace.QName; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; + +import jakarta.xml.bind.JAXBException; + +import org.keycloak.common.util.PemUtils; +import org.keycloak.dom.xmlsec.w3.xmldsig.DSAKeyValueType; +import org.keycloak.dom.xmlsec.w3.xmldsig.KeyValueType; +import org.keycloak.dom.xmlsec.w3.xmldsig.RSAKeyValueType; +import org.keycloak.dom.xmlsec.w3.xmldsig.SignatureType; import org.keycloak.rotation.KeyLocator; +import org.keycloak.saml.common.PicketLinkLogger; +import org.keycloak.saml.common.PicketLinkLoggerFactory; +import org.keycloak.saml.common.constants.GeneralConstants; +import org.keycloak.saml.common.constants.JBossSAMLConstants; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; +import org.keycloak.saml.common.constants.WSTrustConstants; +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.common.exceptions.ProcessingException; +import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.common.util.SecurityActions; +import org.keycloak.saml.common.util.StringUtil; +import org.keycloak.saml.common.util.SystemPropertiesUtil; +import org.keycloak.saml.common.util.TransformerUtil; + +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; /** * Utility for XML Signature Note: You can change the canonicalization method type by using the system property diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/web/util/PostBindingUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/web/util/PostBindingUtil.java index c2371a214ef..044ade7b77a 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/web/util/PostBindingUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/web/util/PostBindingUtil.java @@ -16,15 +16,15 @@ */ package org.keycloak.saml.processing.web.util; -import org.keycloak.saml.common.PicketLinkLogger; -import org.keycloak.saml.common.PicketLinkLoggerFactory; -import org.keycloak.saml.common.constants.GeneralConstants; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Base64; +import org.keycloak.saml.common.PicketLinkLogger; +import org.keycloak.saml.common.PicketLinkLoggerFactory; +import org.keycloak.saml.common.constants.GeneralConstants; + /** * Utility for the HTTP/Post binding * diff --git a/saml-core/src/main/java/org/keycloak/saml/processing/web/util/RedirectBindingUtil.java b/saml-core/src/main/java/org/keycloak/saml/processing/web/util/RedirectBindingUtil.java index 3475f9e488b..4f7e06ff2fb 100755 --- a/saml-core/src/main/java/org/keycloak/saml/processing/web/util/RedirectBindingUtil.java +++ b/saml-core/src/main/java/org/keycloak/saml/processing/web/util/RedirectBindingUtil.java @@ -16,16 +16,16 @@ */ package org.keycloak.saml.processing.web.util; -import org.keycloak.saml.common.constants.GeneralConstants; -import org.keycloak.saml.common.util.StringUtil; -import org.keycloak.saml.processing.api.util.DeflateUtil; - import java.io.IOException; import java.io.InputStream; import java.net.URLDecoder; import java.net.URLEncoder; import java.util.Base64; +import org.keycloak.saml.common.constants.GeneralConstants; +import org.keycloak.saml.common.util.StringUtil; +import org.keycloak.saml.processing.api.util.DeflateUtil; + /** * Utility class for SAML HTTP/Redirect binding * diff --git a/saml-core/src/main/java/org/keycloak/saml/validators/ConditionsValidator.java b/saml-core/src/main/java/org/keycloak/saml/validators/ConditionsValidator.java index cbc277abd01..67c0d6a3d45 100644 --- a/saml-core/src/main/java/org/keycloak/saml/validators/ConditionsValidator.java +++ b/saml-core/src/main/java/org/keycloak/saml/validators/ConditionsValidator.java @@ -16,13 +16,6 @@ */ package org.keycloak.saml.validators; -import org.keycloak.dom.saml.common.CommonConditionsType; -import org.keycloak.dom.saml.v2.assertion.AudienceRestrictionType; -import org.keycloak.dom.saml.v2.assertion.ConditionAbstractType; -import org.keycloak.dom.saml.v2.assertion.ConditionsType; -import org.keycloak.dom.saml.v2.assertion.OneTimeUseType; -import org.keycloak.dom.saml.v2.assertion.ProxyRestrictionType; -import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; import java.net.URI; import java.util.Arrays; import java.util.Collections; @@ -31,6 +24,15 @@ import java.util.Iterator; import java.util.Set; import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.XMLGregorianCalendar; + +import org.keycloak.dom.saml.common.CommonConditionsType; +import org.keycloak.dom.saml.v2.assertion.AudienceRestrictionType; +import org.keycloak.dom.saml.v2.assertion.ConditionAbstractType; +import org.keycloak.dom.saml.v2.assertion.ConditionsType; +import org.keycloak.dom.saml.v2.assertion.OneTimeUseType; +import org.keycloak.dom.saml.v2.assertion.ProxyRestrictionType; +import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; + import org.jboss.logging.Logger; /** diff --git a/saml-core/src/test/java/org/keycloak/rotation/HardcodedKeyLocatorTest.java b/saml-core/src/test/java/org/keycloak/rotation/HardcodedKeyLocatorTest.java index 3ea6c21f73b..d11a471a1bd 100644 --- a/saml-core/src/test/java/org/keycloak/rotation/HardcodedKeyLocatorTest.java +++ b/saml-core/src/test/java/org/keycloak/rotation/HardcodedKeyLocatorTest.java @@ -23,11 +23,13 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; import javax.xml.crypto.dsig.keyinfo.KeyInfo; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.core.util.XMLSignatureUtil; +import org.junit.Assert; +import org.junit.Test; + /** * * @author rmartinc diff --git a/saml-core/src/test/java/org/keycloak/saml/common/util/SecurityActionsTest.java b/saml-core/src/test/java/org/keycloak/saml/common/util/SecurityActionsTest.java index 0b0a0a64470..2c3fbca3e75 100644 --- a/saml-core/src/test/java/org/keycloak/saml/common/util/SecurityActionsTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/common/util/SecurityActionsTest.java @@ -19,6 +19,7 @@ package org.keycloak.saml.common.util; import java.security.AccessControlException; import java.security.AllPermission; import java.security.Policy; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; diff --git a/saml-core/src/test/java/org/keycloak/saml/common/util/StaxParserUtilTest.java b/saml-core/src/test/java/org/keycloak/saml/common/util/StaxParserUtilTest.java index a5e9373a0d0..8b0da60dc42 100644 --- a/saml-core/src/test/java/org/keycloak/saml/common/util/StaxParserUtilTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/common/util/StaxParserUtilTest.java @@ -16,13 +16,8 @@ */ package org.keycloak.saml.common.util; -import org.keycloak.saml.common.exceptions.ParsingException; -import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLProtocolQNames; -import org.keycloak.saml.processing.core.parsers.util.HasQName; - import java.nio.charset.Charset; import java.util.NoSuchElementException; - import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.Characters; @@ -31,6 +26,11 @@ import javax.xml.stream.events.EndElement; import javax.xml.stream.events.StartDocument; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; + +import org.keycloak.saml.common.exceptions.ParsingException; +import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLProtocolQNames; +import org.keycloak.saml.processing.core.parsers.util.HasQName; + import org.apache.commons.io.IOUtils; import org.hamcrest.Matcher; import org.junit.Assert; @@ -39,10 +39,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.w3c.dom.Element; import org.w3c.dom.Text; -import static org.hamcrest.MatcherAssert.assertThat; + import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; /** * diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeParserTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeParserTest.java index 3ecc0e20ad3..05afa67f714 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeParserTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeParserTest.java @@ -1,16 +1,17 @@ package org.keycloak.saml.processing.core.parsers.saml; -import org.junit.Assert; -import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; + import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.saml.common.parsers.AbstractParser; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAttributeParser; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventReader; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; +import org.junit.Assert; +import org.junit.Test; public class SAMLAttributeParserTest { diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeQueryParserTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeQueryParserTest.java index cce0482549f..1be1cf34e2f 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeQueryParserTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeQueryParserTest.java @@ -18,14 +18,15 @@ package org.keycloak.saml.processing.core.parsers.saml; -import org.keycloak.dom.saml.v2.assertion.NameIDType; -import org.keycloak.dom.saml.v2.protocol.AttributeQueryType; import java.io.InputStream; -import org.junit.Test; +import org.keycloak.dom.saml.v2.assertion.NameIDType; +import org.keycloak.dom.saml.v2.protocol.AttributeQueryType; import org.junit.Before; +import org.junit.Test; import org.w3c.dom.Element; + import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeValueParserTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeValueParserTest.java index 394afb2d6c6..10b7dcfe5ef 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeValueParserTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAttributeValueParserTest.java @@ -1,15 +1,17 @@ package org.keycloak.saml.processing.core.parsers.saml; -import javax.xml.stream.events.XMLEvent; -import javax.xml.stream.XMLEventReader; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import org.junit.Assert; -import org.junit.Test; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.XMLEvent; + import org.keycloak.saml.common.parsers.AbstractParser; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAttributeValueParser; +import org.junit.Assert; +import org.junit.Test; + public class SAMLAttributeValueParserTest { private static final String XML_DOC = "Some Text"; diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAuthNRequestParserTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAuthNRequestParserTest.java index a2d0a4387b2..6cb9d4bf534 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAuthNRequestParserTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLAuthNRequestParserTest.java @@ -18,13 +18,14 @@ package org.keycloak.saml.processing.core.parsers.saml; -import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import java.io.InputStream; -import org.junit.Test; +import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.junit.Before; +import org.junit.Test; import org.w3c.dom.Element; + import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParserTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParserTest.java index eb45142f7d0..8fa24148c5f 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParserTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLParserTest.java @@ -16,13 +16,18 @@ */ package org.keycloak.saml.processing.core.parsers.saml; -import org.hamcrest.Matcher; -import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.math.BigInteger; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.security.PrivateKey; +import java.util.Base64; +import java.util.Collections; +import java.util.List; +import javax.xml.namespace.QName; + import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.crypto.CryptoProvider; import org.keycloak.common.util.DerUtils; @@ -74,20 +79,17 @@ import org.keycloak.saml.processing.api.saml.v2.response.SAML2Response; 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.core.saml.v2.util.XMLTimeUtil; + +import org.hamcrest.Matcher; +import org.hamcrest.Matchers; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; import org.w3c.dom.Element; -import javax.xml.namespace.QName; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.math.BigInteger; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.security.PrivateKey; -import java.util.Base64; -import java.util.Collections; -import java.util.List; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; @@ -105,7 +107,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; /** * Test class for SAML parser. diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLSloRequestParserTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLSloRequestParserTest.java index 53246264621..e2dd6481eb0 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLSloRequestParserTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/parsers/saml/SAMLSloRequestParserTest.java @@ -18,14 +18,15 @@ package org.keycloak.saml.processing.core.parsers.saml; -import org.keycloak.dom.saml.v2.assertion.NameIDType; -import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; import java.io.InputStream; -import org.junit.Test; +import org.keycloak.dom.saml.v2.assertion.NameIDType; +import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; import org.junit.Before; +import org.junit.Test; import org.w3c.dom.Element; + import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/util/ArtifactResponseUtilTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/util/ArtifactResponseUtilTest.java index 27e6e40b71f..d7c51e25b9e 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/util/ArtifactResponseUtilTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/util/ArtifactResponseUtilTest.java @@ -17,18 +17,19 @@ package org.keycloak.saml.processing.core.saml.v2.util; -import junit.framework.TestCase; -import org.junit.Assert; +import java.io.InputStream; +import java.util.Optional; + import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; + +import junit.framework.TestCase; +import org.junit.Assert; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import java.io.InputStream; -import java.util.Optional; - /** * @author Thibault Morin (https://tmorin.github.io) */ diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/util/AssertionUtilTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/util/AssertionUtilTest.java index 8fe948d6c0f..201276311c7 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/util/AssertionUtilTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/util/AssertionUtilTest.java @@ -10,8 +10,6 @@ import java.util.Base64; import java.util.Collections; import java.util.Scanner; -import org.junit.BeforeClass; -import org.junit.Test; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.crypto.CryptoProvider; import org.keycloak.common.util.DerUtils; @@ -21,6 +19,9 @@ import org.keycloak.dom.saml.v2.assertion.SubjectType.STSubType; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.saml.processing.core.parsers.saml.SAMLParser; import org.keycloak.saml.processing.core.parsers.saml.SAMLParserTest; + +import org.junit.BeforeClass; +import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLAssertionWriterTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLAssertionWriterTest.java index 6e78dcc16c1..e4747502997 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLAssertionWriterTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/writers/SAMLAssertionWriterTest.java @@ -1,7 +1,9 @@ package org.keycloak.saml.processing.core.saml.v2.writers; -import org.junit.Assert; -import org.junit.Test; +import java.io.ByteArrayOutputStream; +import java.net.URI; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.dom.saml.v2.assertion.AuthnContextClassRefType; import org.keycloak.dom.saml.v2.assertion.AuthnContextDeclType; import org.keycloak.dom.saml.v2.assertion.AuthnContextType; @@ -11,9 +13,8 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; -import javax.xml.datatype.XMLGregorianCalendar; -import java.io.ByteArrayOutputStream; -import java.net.URI; +import org.junit.Assert; +import org.junit.Test; public class SAMLAssertionWriterTest { @Test diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/writers/XUATokenWriterTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/writers/XUATokenWriterTest.java index f202d2bd474..05189320e1c 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/writers/XUATokenWriterTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/saml/v2/writers/XUATokenWriterTest.java @@ -2,8 +2,6 @@ package org.keycloak.saml.processing.core.saml.v2.writers; import java.io.ByteArrayOutputStream; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.saml.common.constants.GeneralConstants; @@ -12,6 +10,9 @@ import org.keycloak.saml.common.exceptions.ConfigurationException; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.common.util.StaxUtil; + +import org.junit.Assert; +import org.junit.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/util/IDFedLSInputResolverTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/util/IDFedLSInputResolverTest.java index ecd8e6e7ffa..b7a18e41e98 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/util/IDFedLSInputResolverTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/util/IDFedLSInputResolverTest.java @@ -16,14 +16,14 @@ */ package org.keycloak.saml.processing.core.util; -import org.keycloak.saml.common.util.SecurityActions; import java.io.IOException; import java.io.InputStream; import java.net.URL; - import javax.xml.XMLConstants; import javax.xml.validation.SchemaFactory; +import org.keycloak.saml.common.util.SecurityActions; + import org.junit.Test; import org.w3c.dom.ls.LSInput; import org.w3c.dom.ls.LSResourceResolver; diff --git a/saml-core/src/test/java/org/keycloak/saml/processing/core/util/JAXPValidationUtilTest.java b/saml-core/src/test/java/org/keycloak/saml/processing/core/util/JAXPValidationUtilTest.java index 2a6ec584152..1561b02d275 100644 --- a/saml-core/src/test/java/org/keycloak/saml/processing/core/util/JAXPValidationUtilTest.java +++ b/saml-core/src/test/java/org/keycloak/saml/processing/core/util/JAXPValidationUtilTest.java @@ -18,10 +18,12 @@ package org.keycloak.saml.processing.core.util; import java.io.ByteArrayInputStream; import java.io.IOException; + import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.junit.Test; import org.xml.sax.SAXException; + import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java b/server-spi-private/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java index 2c69e72cbd1..7ec2706ac63 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/AbstractAuthenticationFlowContext.java @@ -17,9 +17,12 @@ package org.keycloak.authentication; -import org.keycloak.http.HttpRequest; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; +import org.keycloak.http.HttpRequest; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.AuthenticatorConfigModel; @@ -28,9 +31,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.FormMessage; import org.keycloak.services.managers.BruteForceProtector; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlow.java b/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlow.java index 2fee6ef14ca..5c4dd2ae780 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlow.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlow.java @@ -17,10 +17,11 @@ package org.keycloak.authentication; -import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.List; +import jakarta.ws.rs.core.Response; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowContext.java b/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowContext.java index 390be08b361..e16cbf9e541 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowContext.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowContext.java @@ -17,15 +17,15 @@ package org.keycloak.authentication; +import java.net.URI; +import java.util.List; + import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.models.utils.FormMessage; import org.keycloak.sessions.AuthenticationSessionModel; -import java.net.URI; -import java.util.List; - /** * This interface encapsulates information about an execution in an AuthenticationFlow. It is also used to set * the status of the execution being performed. diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowException.java b/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowException.java index 3e1ad3b24e5..b031f479998 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowException.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/AuthenticationFlowException.java @@ -17,9 +17,10 @@ package org.keycloak.authentication; -import jakarta.ws.rs.core.Response; import java.util.List; +import jakarta.ws.rs.core.Response; + /** * Throw this exception from an Authenticator, FormAuthenticator, or FormAction if you want to completely abort the flow. * diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/Authenticator.java b/server-spi-private/src/main/java/org/keycloak/authentication/Authenticator.java index aea5630290a..9ec9aa8b368 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/Authenticator.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/Authenticator.java @@ -17,15 +17,15 @@ package org.keycloak.authentication; +import java.util.Collections; +import java.util.List; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RequiredActionProviderModel; import org.keycloak.models.UserModel; import org.keycloak.provider.Provider; -import java.util.Collections; -import java.util.List; - /** * This interface is for users that want to add custom authenticators to an authentication flow. * You must implement this interface as well as an AuthenticatorFactory. diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/ClientAuthenticationFlowContext.java b/server-spi-private/src/main/java/org/keycloak/authentication/ClientAuthenticationFlowContext.java index 4553e3f5d95..170059f4c87 100644 --- a/server-spi-private/src/main/java/org/keycloak/authentication/ClientAuthenticationFlowContext.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/ClientAuthenticationFlowContext.java @@ -17,10 +17,10 @@ package org.keycloak.authentication; -import org.keycloak.models.ClientModel; - import java.util.Map; +import org.keycloak.models.ClientModel; + /** * Encapsulates information about the execution in ClientAuthenticationFlow * diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/ClientAuthenticatorFactory.java b/server-spi-private/src/main/java/org/keycloak/authentication/ClientAuthenticatorFactory.java index 8d6dcd9b4fe..47d42ca7a9b 100644 --- a/server-spi-private/src/main/java/org/keycloak/authentication/ClientAuthenticatorFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/ClientAuthenticatorFactory.java @@ -17,13 +17,13 @@ package org.keycloak.authentication; +import java.util.Map; +import java.util.Set; + import org.keycloak.models.ClientModel; import org.keycloak.provider.ConfiguredPerClientProvider; import org.keycloak.provider.ProviderFactory; -import java.util.Map; -import java.util.Set; - /** * Factory for creating ClientAuthenticator instances. This is a singleton and created when Keycloak boots. * diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/ConfigurableAuthenticatorFactory.java b/server-spi-private/src/main/java/org/keycloak/authentication/ConfigurableAuthenticatorFactory.java index c00a8db9e46..82afd03fbe3 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/ConfigurableAuthenticatorFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/ConfigurableAuthenticatorFactory.java @@ -19,6 +19,7 @@ package org.keycloak.authentication; import java.util.Collections; import java.util.Set; + import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ConfiguredProvider; diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/CredentialValidator.java b/server-spi-private/src/main/java/org/keycloak/authentication/CredentialValidator.java index a1cbb555e32..5eb274d7ddc 100644 --- a/server-spi-private/src/main/java/org/keycloak/authentication/CredentialValidator.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/CredentialValidator.java @@ -1,14 +1,14 @@ package org.keycloak.authentication; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.credential.CredentialModel; import org.keycloak.credential.CredentialProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import java.util.List; -import java.util.stream.Collectors; - public interface CredentialValidator { T getCredentialProvider(KeycloakSession session); default List getCredentials(KeycloakSession session, RealmModel realm, UserModel user) { diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/FormAuthenticator.java b/server-spi-private/src/main/java/org/keycloak/authentication/FormAuthenticator.java index b883a2381c1..9a4c60b7b19 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/FormAuthenticator.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/FormAuthenticator.java @@ -17,11 +17,11 @@ package org.keycloak.authentication; +import jakarta.ws.rs.core.Response; + import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.provider.Provider; -import jakarta.ws.rs.core.Response; - /** * This class is responsible for rendering a form. The way it works is that each FormAction that is a child of this * FormAuthenticator, will have its buildPage() method call first, then the FormAuthenticator.render() method will be invoked. diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/FormContext.java b/server-spi-private/src/main/java/org/keycloak/authentication/FormContext.java index f901af09795..fab6e54e605 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/FormContext.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/FormContext.java @@ -17,9 +17,11 @@ package org.keycloak.authentication; -import org.keycloak.http.HttpRequest; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; +import org.keycloak.http.HttpRequest; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticatorConfigModel; import org.keycloak.models.KeycloakSession; @@ -27,8 +29,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.UriInfo; - /** * Interface that encapsulates the current state of the current form being executed * diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionContext.java b/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionContext.java index 6d1f0296837..83427103521 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionContext.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionContext.java @@ -17,20 +17,21 @@ package org.keycloak.authentication; -import org.keycloak.http.HttpRequest; +import java.net.URI; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; import org.keycloak.forms.login.LoginFormsProvider; +import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RequiredActionConfigModel; import org.keycloak.models.UserModel; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; -import java.net.URI; - /** * Interface that encapsulates information about the current required action * diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionFactory.java b/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionFactory.java index 8b2cd299cf1..1e419765289 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/RequiredActionFactory.java @@ -17,6 +17,8 @@ package org.keycloak.authentication; +import java.util.List; + import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -28,8 +30,6 @@ import org.keycloak.provider.ProviderFactory; import org.keycloak.userprofile.ValidationException; import org.keycloak.validate.ValidationError; -import java.util.List; - /** * Factory interface for {@link RequiredActionProvider RequiredActionProvider's}. * diff --git a/server-spi-private/src/main/java/org/keycloak/authentication/ValidationContext.java b/server-spi-private/src/main/java/org/keycloak/authentication/ValidationContext.java index e460c384c32..b5055832616 100755 --- a/server-spi-private/src/main/java/org/keycloak/authentication/ValidationContext.java +++ b/server-spi-private/src/main/java/org/keycloak/authentication/ValidationContext.java @@ -17,10 +17,11 @@ package org.keycloak.authentication; -import org.keycloak.models.utils.FormMessage; +import java.util.List; import jakarta.ws.rs.core.MultivaluedMap; -import java.util.List; + +import org.keycloak.models.utils.FormMessage; /** * Interface that encapsulates the current validation that is being performed. Calling success() or validationError() diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/AdminPermissionsSchema.java b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/AdminPermissionsSchema.java index 94e6074878f..81e7e7dd407 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/AdminPermissionsSchema.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/AdminPermissionsSchema.java @@ -28,15 +28,16 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Predicate; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.fgap.evaluation.FGAPPolicyEvaluator; +import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluationStorageProvider; import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluator; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.model.Scope; import org.keycloak.authorization.policy.evaluation.PolicyEvaluator; -import org.keycloak.authorization.fgap.evaluation.partial.PartialEvaluationStorageProvider; import org.keycloak.authorization.store.ResourceStore; import org.keycloak.authorization.store.ScopeStore; import org.keycloak.authorization.store.StoreFactory; diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/FGAPEvaluation.java b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/FGAPEvaluation.java index 98b8f7b8d49..4d96da1b48b 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/FGAPEvaluation.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/FGAPEvaluation.java @@ -17,8 +17,6 @@ package org.keycloak.authorization.fgap.evaluation; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.SCHEMA; - import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -33,6 +31,8 @@ import org.keycloak.authorization.policy.evaluation.Evaluation; import org.keycloak.authorization.policy.evaluation.EvaluationContext; import org.keycloak.authorization.policy.evaluation.Realm; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.SCHEMA; + class FGAPEvaluation implements Evaluation { private final Evaluation evaluation; diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/FGAPPolicyEvaluator.java b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/FGAPPolicyEvaluator.java index 769a2ccfbd7..040b8607444 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/FGAPPolicyEvaluator.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/FGAPPolicyEvaluator.java @@ -18,8 +18,6 @@ package org.keycloak.authorization.fgap.evaluation; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; - import java.util.Map; import java.util.function.Consumer; @@ -39,6 +37,8 @@ import org.keycloak.authorization.store.PolicyStore; import org.keycloak.authorization.store.ResourceStore; import org.keycloak.authorization.store.StoreFactory; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; + /** * A {@link PolicyEvaluator} specific for evaluating permisions in the context of the {@link org.keycloak.common.Profile.Feature#ADMIN_FINE_GRAINED_AUTHZ_V2} feature. */ diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/PartialEvaluationContext.java b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/PartialEvaluationContext.java index fdc92f355f7..1637014d320 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/PartialEvaluationContext.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/PartialEvaluationContext.java @@ -17,16 +17,17 @@ package org.keycloak.authorization.fgap.evaluation.partial; -import static java.util.function.Predicate.not; - import java.util.Set; import java.util.stream.Collectors; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Path; + import org.keycloak.representations.idm.authorization.ResourceType; +import static java.util.function.Predicate.not; + /** * An {@link PartialEvaluationContext} instance provides access to contextual information when building a query for realm * resources of a given {@link ResourceType}. diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/PartialEvaluator.java b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/PartialEvaluator.java index aab1eac95ef..a33d6f5930a 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/PartialEvaluator.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/PartialEvaluator.java @@ -17,8 +17,6 @@ package org.keycloak.authorization.fgap.evaluation.partial; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.isSkipEvaluation; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -30,6 +28,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Path; import jakarta.persistence.criteria.Predicate; + import org.keycloak.Config; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; @@ -45,6 +44,8 @@ import org.keycloak.models.UserModel; import org.keycloak.representations.idm.authorization.Logic; import org.keycloak.representations.idm.authorization.ResourceType; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.isSkipEvaluation; + public final class PartialEvaluator { private static final String NO_ID = "none"; diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/UserResourceTypePolicyEvaluator.java b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/UserResourceTypePolicyEvaluator.java index 04368d33bba..b294fc98b19 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/UserResourceTypePolicyEvaluator.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/fgap/evaluation/partial/UserResourceTypePolicyEvaluator.java @@ -18,8 +18,6 @@ package org.keycloak.authorization.fgap.evaluation.partial; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; - import java.util.HashSet; import java.util.Set; import java.util.function.Consumer; @@ -39,6 +37,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; + public final class UserResourceTypePolicyEvaluator implements ResourceTypePolicyEvaluator { @Override diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/model/AbstractAuthorizationModel.java b/server-spi-private/src/main/java/org/keycloak/authorization/model/AbstractAuthorizationModel.java index e8982a47afb..1c125ce8f04 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/model/AbstractAuthorizationModel.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/model/AbstractAuthorizationModel.java @@ -16,10 +16,10 @@ */ package org.keycloak.authorization.model; -import org.keycloak.authorization.store.StoreFactory; - import java.util.Objects; +import org.keycloak.authorization.store.StoreFactory; + public abstract class AbstractAuthorizationModel { protected final StoreFactory storeFactory; diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/model/Policy.java b/server-spi-private/src/main/java/org/keycloak/authorization/model/Policy.java index 52adfc42080..4da8956ca13 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/model/Policy.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/model/Policy.java @@ -18,14 +18,14 @@ package org.keycloak.authorization.model; -import org.keycloak.representations.idm.authorization.DecisionStrategy; -import org.keycloak.representations.idm.authorization.Logic; - import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.representations.idm.authorization.DecisionStrategy; +import org.keycloak.representations.idm.authorization.Logic; + /** * Represents an authorization policy and all the configuration associated with it. * diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/permission/ResourcePermission.java b/server-spi-private/src/main/java/org/keycloak/authorization/permission/ResourcePermission.java index 71acd242ad1..bf0aa5e15e0 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/permission/ResourcePermission.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/permission/ResourcePermission.java @@ -18,10 +18,6 @@ package org.keycloak.authorization.permission; -import org.keycloak.authorization.model.Resource; -import org.keycloak.authorization.model.ResourceServer; -import org.keycloak.authorization.model.Scope; - import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -31,6 +27,10 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; +import org.keycloak.authorization.model.Resource; +import org.keycloak.authorization.model.ResourceServer; +import org.keycloak.authorization.model.Scope; + /** * Represents a permission for a given resource. * diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/permission/evaluator/Evaluators.java b/server-spi-private/src/main/java/org/keycloak/authorization/permission/evaluator/Evaluators.java index 4da1f2107e3..64698bed837 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/permission/evaluator/Evaluators.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/permission/evaluator/Evaluators.java @@ -18,14 +18,14 @@ package org.keycloak.authorization.permission.evaluator; +import java.util.Collection; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.permission.ResourcePermission; import org.keycloak.authorization.policy.evaluation.EvaluationContext; import org.keycloak.representations.idm.authorization.AuthorizationRequest; -import java.util.Collection; - /** * A factory for the different {@link PermissionEvaluator} implementations. * diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/AbstractDecisionCollector.java b/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/AbstractDecisionCollector.java index c405fdf6aea..611f3031628 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/AbstractDecisionCollector.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/AbstractDecisionCollector.java @@ -17,17 +17,17 @@ package org.keycloak.authorization.policy.evaluation; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; + import org.keycloak.authorization.Decision; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.permission.ResourcePermission; import org.keycloak.authorization.policy.evaluation.Result.PolicyResult; import org.keycloak.representations.idm.authorization.DecisionStrategy; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; - /** * @author Pedro Igor */ diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/DecisionPermissionCollector.java b/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/DecisionPermissionCollector.java index 7fc47abbb88..432fcf52409 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/DecisionPermissionCollector.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/DecisionPermissionCollector.java @@ -17,6 +17,15 @@ package org.keycloak.authorization.policy.evaluation; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; @@ -28,15 +37,6 @@ import org.keycloak.representations.idm.authorization.AuthorizationRequest; import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.Permission; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - /** * @author Pedro Igor */ diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/PolicyEvaluator.java b/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/PolicyEvaluator.java index 7bb905e9b89..e422d1f20e3 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/PolicyEvaluator.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/PolicyEvaluator.java @@ -18,13 +18,13 @@ package org.keycloak.authorization.policy.evaluation; +import java.util.Map; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.Decision; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.permission.ResourcePermission; -import java.util.Map; - /** *

A {@link PolicyEvaluator} evaluates authorization policies based on a given {@link ResourcePermission}, sending * the results to a {@link Decision} point through the methods defined in that interface. diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/Result.java b/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/Result.java index 1cea92263d5..65c886c9cb4 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/Result.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/policy/evaluation/Result.java @@ -18,15 +18,15 @@ package org.keycloak.authorization.policy.evaluation; -import org.keycloak.authorization.Decision.Effect; -import org.keycloak.authorization.model.Policy; -import org.keycloak.authorization.permission.ResourcePermission; - import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; +import org.keycloak.authorization.Decision.Effect; +import org.keycloak.authorization.model.Policy; +import org.keycloak.authorization.permission.ResourcePermission; + /** * @author Pedro Igor */ diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/store/AuthorizationStoreFactory.java b/server-spi-private/src/main/java/org/keycloak/authorization/store/AuthorizationStoreFactory.java index d7df7cce1fd..7b6543b0b69 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/store/AuthorizationStoreFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/store/AuthorizationStoreFactory.java @@ -27,9 +27,9 @@ import org.keycloak.authorization.store.syncronization.RealmSynchronizer; import org.keycloak.authorization.store.syncronization.RoleSynchronizer; import org.keycloak.authorization.store.syncronization.Synchronizer; import org.keycloak.authorization.store.syncronization.UserSynchronizer; -import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.ClientModel.ClientRemovedEvent; import org.keycloak.models.GroupModel.GroupRemovedEvent; +import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel.RealmRemovedEvent; import org.keycloak.models.RoleContainerModel.RoleRemovedEvent; import org.keycloak.models.UserModel.UserRemovedEvent; diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/store/ResourceStore.java b/server-spi-private/src/main/java/org/keycloak/authorization/store/ResourceStore.java index 3c139e40c4b..666efcfc1dc 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/store/ResourceStore.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/store/ResourceStore.java @@ -16,10 +16,6 @@ */ package org.keycloak.authorization.store; -import org.keycloak.authorization.model.Resource; -import org.keycloak.authorization.model.ResourceServer; -import org.keycloak.authorization.model.Scope; - import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -27,6 +23,10 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; +import org.keycloak.authorization.model.Resource; +import org.keycloak.authorization.model.ResourceServer; +import org.keycloak.authorization.model.Scope; + /** * A {@link ResourceStore} is responsible to manage the persistence of {@link Resource} instances. * diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/store/ScopeStore.java b/server-spi-private/src/main/java/org/keycloak/authorization/store/ScopeStore.java index 2821b2a3d11..b7576c44033 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/store/ScopeStore.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/store/ScopeStore.java @@ -17,12 +17,12 @@ package org.keycloak.authorization.store; -import org.keycloak.authorization.model.ResourceServer; -import org.keycloak.authorization.model.Scope; - import java.util.List; import java.util.Map; +import org.keycloak.authorization.model.ResourceServer; +import org.keycloak.authorization.model.Scope; + /** * A {@link ScopeStore} is responsible to manage the persistence of {@link Scope} instances. * diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/ClientApplicationSynchronizer.java b/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/ClientApplicationSynchronizer.java index 272866e83eb..c577c319eb7 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/ClientApplicationSynchronizer.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/ClientApplicationSynchronizer.java @@ -22,15 +22,15 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.policy.provider.PolicyProviderFactory; import org.keycloak.authorization.store.ResourceServerStore; import org.keycloak.authorization.store.StoreFactory; -import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.ClientModel.ClientRemovedEvent; +import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderFactory; import org.keycloak.representations.idm.authorization.ClientPolicyRepresentation; diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/GroupSynchronizer.java b/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/GroupSynchronizer.java index 1e6ff68ec52..78345928466 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/GroupSynchronizer.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/GroupSynchronizer.java @@ -1,7 +1,7 @@ package org.keycloak.authorization.store.syncronization; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.models.GroupModel.GroupRemovedEvent; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderFactory; diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/RoleSynchronizer.java b/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/RoleSynchronizer.java index 6d7828ed3ef..d320960f27e 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/RoleSynchronizer.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/RoleSynchronizer.java @@ -1,7 +1,7 @@ package org.keycloak.authorization.store.syncronization; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RoleContainerModel.RoleRemovedEvent; import org.keycloak.provider.ProviderFactory; diff --git a/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/UserSynchronizer.java b/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/UserSynchronizer.java index 8d812ed1c4c..419596f45ff 100644 --- a/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/UserSynchronizer.java +++ b/server-spi-private/src/main/java/org/keycloak/authorization/store/syncronization/UserSynchronizer.java @@ -20,8 +20,8 @@ package org.keycloak.authorization.store.syncronization; import java.util.EnumMap; import java.util.Map; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.store.PermissionTicketStore; import org.keycloak.authorization.store.PolicyStore; diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java index 40458edf95a..de38570dd0a 100755 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProvider.java @@ -16,7 +16,17 @@ */ package org.keycloak.broker.provider; -import org.jboss.logging.Logger; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.events.EventBuilder; @@ -30,16 +40,7 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.Booleans; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; - -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; +import org.jboss.logging.Logger; /** * @author Pedro Igor diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderFactory.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderFactory.java index 69fa179e10c..60bac1519fc 100755 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderFactory.java @@ -16,13 +16,13 @@ */ package org.keycloak.broker.provider; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import java.util.HashMap; -import java.util.Map; - /** * @author Pedro Igor */ diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderMapper.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderMapper.java index 72f8eef3888..e9bd2072ebd 100755 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderMapper.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/AbstractIdentityProviderMapper.java @@ -17,7 +17,6 @@ package org.keycloak.broker.provider; -import org.jboss.logging.Logger; import org.keycloak.broker.provider.mappersync.ConfigSyncEventListener; import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.KeycloakSession; @@ -25,6 +24,8 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import org.jboss.logging.Logger; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/AuthenticationRequest.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/AuthenticationRequest.java index f344bd80b42..e304d161c79 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/AuthenticationRequest.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/AuthenticationRequest.java @@ -16,14 +16,14 @@ */ package org.keycloak.broker.provider; -import org.keycloak.http.HttpRequest; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.broker.provider.util.IdentityBrokerState; +import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.UriInfo; - /** * @author Pedro Igor */ diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java index 3b304066742..4d268d71cf1 100755 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/BrokeredIdentityContext.java @@ -17,11 +17,6 @@ package org.keycloak.broker.provider; -import org.keycloak.models.Constants; -import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.UserSessionModel; -import org.keycloak.sessions.AuthenticationSessionModel; - import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -29,6 +24,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.keycloak.models.Constants; +import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.UserSessionModel; +import org.keycloak.sessions.AuthenticationSessionModel; + /** *

Represents all identity information obtained from an {@link org.keycloak.broker.provider.IdentityProvider} after a * successful authentication.

diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/DefaultDataMarshaller.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/DefaultDataMarshaller.java index 8aa8dab3d2f..b013e8e33db 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/DefaultDataMarshaller.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/DefaultDataMarshaller.java @@ -17,12 +17,12 @@ package org.keycloak.broker.provider; -import org.keycloak.common.util.Base64Url; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.util.List; +import org.keycloak.common.util.Base64Url; +import org.keycloak.util.JsonSerialization; + /** * @author Marek Posolda */ diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeExternalToken.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeExternalToken.java index 2449739c9e6..18c3d7eff78 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeExternalToken.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeExternalToken.java @@ -16,9 +16,9 @@ */ package org.keycloak.broker.provider; -import org.keycloak.models.UserSessionModel; - import jakarta.ws.rs.core.MultivaluedMap; + +import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.oidc.TokenExchangeContext; import org.keycloak.protocol.oidc.TokenExchangeProvider; diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeTokenToIdentityProviderToken.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeTokenToIdentityProviderToken.java index 6ab3256de54..90985de0fbe 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeTokenToIdentityProviderToken.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/ExchangeTokenToIdentityProviderToken.java @@ -16,15 +16,15 @@ */ package org.keycloak.broker.provider; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.events.EventBuilder; import org.keycloak.models.ClientModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProvider.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProvider.java index 375d3831a7e..8cf5b14f1ac 100755 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProvider.java @@ -16,15 +16,15 @@ */ package org.keycloak.broker.provider; -import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.RealmModel; -import org.keycloak.provider.Provider; +import java.util.Arrays; +import java.util.List; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriInfo; -import java.util.Arrays; -import java.util.List; +import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.RealmModel; +import org.keycloak.provider.Provider; /** * @author Pedro Igor diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderFactory.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderFactory.java index 84582f635f6..ee16bb5ca34 100755 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderFactory.java @@ -16,16 +16,16 @@ */ package org.keycloak.broker.provider; +import java.util.Collections; +import java.util.List; +import java.util.Map; + import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ConfiguredProvider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderFactory; -import java.util.Collections; -import java.util.List; -import java.util.Map; - /** * @author Pedro Igor */ diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapper.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapper.java index 7ea00b02153..5d6d5791434 100755 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapper.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapper.java @@ -17,6 +17,10 @@ package org.keycloak.broker.provider; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.models.KeycloakSession; @@ -26,10 +30,6 @@ import org.keycloak.provider.ConfiguredProvider; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapperSyncModeDelegate.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapperSyncModeDelegate.java index 7a9374c7f8b..e5e4b4cf99a 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapperSyncModeDelegate.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/IdentityProviderMapperSyncModeDelegate.java @@ -1,6 +1,5 @@ package org.keycloak.broker.provider; -import org.jboss.logging.Logger; import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderMapperSyncMode; import org.keycloak.models.IdentityProviderSyncMode; @@ -8,6 +7,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import org.jboss.logging.Logger; + public final class IdentityProviderMapperSyncModeDelegate { protected static final Logger logger = Logger.getLogger(IdentityProviderMapperSyncModeDelegate.class); diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/UserAuthenticationIdentityProvider.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/UserAuthenticationIdentityProvider.java index c208a5073a6..7d1c68d1ac5 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/UserAuthenticationIdentityProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/UserAuthenticationIdentityProvider.java @@ -1,5 +1,8 @@ package org.keycloak.broker.provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.events.EventBuilder; import org.keycloak.models.FederatedIdentityModel; import org.keycloak.models.IdentityProviderModel; @@ -9,9 +12,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; - public interface UserAuthenticationIdentityProvider extends IdentityProvider { String EXTERNAL_IDENTITY_PROVIDER = "EXTERNAL_IDENTITY_PROVIDER"; diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/ConfigSyncEventListener.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/ConfigSyncEventListener.java index dfd2d69c4d4..6263d804003 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/ConfigSyncEventListener.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/ConfigSyncEventListener.java @@ -17,12 +17,13 @@ package org.keycloak.broker.provider.mappersync; -import org.jboss.logging.Logger; +import java.util.Arrays; +import java.util.List; + import org.keycloak.provider.ProviderEvent; import org.keycloak.provider.ProviderEventListener; -import java.util.Arrays; -import java.util.List; +import org.jboss.logging.Logger; /** * Event listener which synchronizes mapper configs, when references change. diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/ConfigSynchronizer.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/ConfigSynchronizer.java index 6ec90ea1aeb..3dcb4d08921 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/ConfigSynchronizer.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/ConfigSynchronizer.java @@ -17,9 +17,10 @@ package org.keycloak.broker.provider.mappersync; -import org.jboss.logging.Logger; import org.keycloak.provider.ProviderEvent; +import org.jboss.logging.Logger; + /** * Interface for updating references in mapper configs, when references (like group path) change. * diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/GroupConfigPropertyByPathSynchronizer.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/GroupConfigPropertyByPathSynchronizer.java index 2fabd83ee1a..7b5d278f7b7 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/GroupConfigPropertyByPathSynchronizer.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/GroupConfigPropertyByPathSynchronizer.java @@ -17,11 +17,11 @@ package org.keycloak.broker.provider.mappersync; +import java.util.Map; + import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.models.GroupModel; -import java.util.Map; - import static org.keycloak.models.utils.KeycloakModelUtils.GROUP_PATH_SEPARATOR; /** diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/RoleConfigPropertyByClientIdSynchronizer.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/RoleConfigPropertyByClientIdSynchronizer.java index ead54f04a82..370afe84db9 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/RoleConfigPropertyByClientIdSynchronizer.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/RoleConfigPropertyByClientIdSynchronizer.java @@ -17,12 +17,12 @@ package org.keycloak.broker.provider.mappersync; +import java.util.Map; + import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.models.ClientModel; import org.keycloak.models.utils.KeycloakModelUtils; -import java.util.Map; - /** * Updates a role reference in a mapper config, when a client ID changes. * diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/RoleConfigPropertyByRoleNameSynchronizer.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/RoleConfigPropertyByRoleNameSynchronizer.java index 5f52c62e3e1..376282f5dd9 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/RoleConfigPropertyByRoleNameSynchronizer.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/mappersync/RoleConfigPropertyByRoleNameSynchronizer.java @@ -17,12 +17,12 @@ package org.keycloak.broker.provider.mappersync; +import java.util.Map; + import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.models.RoleModel; import org.keycloak.models.utils.KeycloakModelUtils; -import java.util.Map; - /** * Updates a role reference a in mapper config, when a role name changes. * diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/util/IdentityBrokerState.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/util/IdentityBrokerState.java index 636da56a983..0d9efb7bc88 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/util/IdentityBrokerState.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/util/IdentityBrokerState.java @@ -17,15 +17,15 @@ package org.keycloak.broker.provider.util; -import org.keycloak.models.ClientModel; -import org.keycloak.models.RealmModel; -import org.keycloak.common.util.Base64Url; - import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.UUID; import java.util.regex.Pattern; +import org.keycloak.common.util.Base64Url; +import org.keycloak.models.ClientModel; +import org.keycloak.models.RealmModel; + /** * Encapsulates parsing logic related to state passed to identity provider in "state" (or RelayState) parameter * diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/util/IdentityProviderTypeUtil.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/util/IdentityProviderTypeUtil.java index 0993becb01b..c955da7ca50 100644 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/util/IdentityProviderTypeUtil.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/util/IdentityProviderTypeUtil.java @@ -1,24 +1,24 @@ package org.keycloak.broker.provider.util; -import org.keycloak.models.IdentityProviderCapability; -import org.keycloak.models.IdentityProviderType; -import org.keycloak.broker.provider.ClientAssertionIdentityProvider; -import org.keycloak.broker.provider.ExchangeExternalToken; -import org.keycloak.broker.provider.IdentityProvider; -import org.keycloak.broker.provider.JWTAuthorizationGrantProvider; -import org.keycloak.broker.provider.UserAuthenticationIdentityProvider; -import org.keycloak.broker.social.SocialIdentityProvider; -import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.provider.ProviderFactory; - import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.keycloak.broker.provider.ClientAssertionIdentityProvider; +import org.keycloak.broker.provider.ExchangeExternalToken; +import org.keycloak.broker.provider.IdentityProvider; +import org.keycloak.broker.provider.JWTAuthorizationGrantProvider; +import org.keycloak.broker.provider.UserAuthenticationIdentityProvider; +import org.keycloak.broker.social.SocialIdentityProvider; +import org.keycloak.models.IdentityProviderCapability; +import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderType; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.provider.ProviderFactory; + public class IdentityProviderTypeUtil { private IdentityProviderTypeUtil() { diff --git a/server-spi-private/src/main/java/org/keycloak/broker/provider/util/SimpleHttp.java b/server-spi-private/src/main/java/org/keycloak/broker/provider/util/SimpleHttp.java index ead655fe75e..49ffb705f66 100755 --- a/server-spi-private/src/main/java/org/keycloak/broker/provider/util/SimpleHttp.java +++ b/server-spi-private/src/main/java/org/keycloak/broker/provider/util/SimpleHttp.java @@ -17,6 +17,29 @@ package org.keycloak.broker.provider.util; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringWriter; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import java.util.zip.GZIPInputStream; + +import org.keycloak.connections.httpclient.HttpClientProvider; +import org.keycloak.connections.httpclient.SafeInputStream; +import org.keycloak.models.KeycloakSession; +import org.keycloak.util.JsonSerialization; + import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -41,28 +64,6 @@ import org.apache.http.client.utils.URIBuilder; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.message.BasicNameValuePair; -import org.keycloak.connections.httpclient.HttpClientProvider; -import org.keycloak.connections.httpclient.SafeInputStream; -import org.keycloak.models.KeycloakSession; -import org.keycloak.util.JsonSerialization; - -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.StringWriter; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import java.util.zip.GZIPInputStream; /** * @author Stian Thorgersen diff --git a/server-spi-private/src/main/java/org/keycloak/cache/AlternativeLookupProvider.java b/server-spi-private/src/main/java/org/keycloak/cache/AlternativeLookupProvider.java index b2d1133776d..377d24e0d13 100644 --- a/server-spi-private/src/main/java/org/keycloak/cache/AlternativeLookupProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/cache/AlternativeLookupProvider.java @@ -1,12 +1,12 @@ package org.keycloak.cache; +import java.util.Map; + import org.keycloak.models.ClientModel; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.Provider; -import java.util.Map; - public interface AlternativeLookupProvider extends Provider { IdentityProviderModel lookupIdentityProviderFromIssuer(KeycloakSession session, String issuerUrl); diff --git a/server-spi-private/src/main/java/org/keycloak/client/clienttype/ClientType.java b/server-spi-private/src/main/java/org/keycloak/client/clienttype/ClientType.java index f017f004d66..3e2811bd26b 100644 --- a/server-spi-private/src/main/java/org/keycloak/client/clienttype/ClientType.java +++ b/server-spi-private/src/main/java/org/keycloak/client/clienttype/ClientType.java @@ -18,10 +18,10 @@ package org.keycloak.client.clienttype; -import org.keycloak.models.ClientModel; - import java.util.Set; +import org.keycloak.models.ClientModel; + /** * TODO:client-types javadocs * diff --git a/server-spi-private/src/main/java/org/keycloak/component/AmphibianProviderFactory.java b/server-spi-private/src/main/java/org/keycloak/component/AmphibianProviderFactory.java index a94080fd17d..2d2af080a1c 100644 --- a/server-spi-private/src/main/java/org/keycloak/component/AmphibianProviderFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/component/AmphibianProviderFactory.java @@ -16,16 +16,17 @@ */ package org.keycloak.component; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + import org.keycloak.Config.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.provider.InvalidationHandler.ObjectType; -import java.util.Collections; -import java.util.List; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderFactory; -import java.util.Objects; /** * Ancestor for a provider factory for both a standalone {@link ProviderFactory} and a {@link ComponentFactory}. It diff --git a/server-spi-private/src/main/java/org/keycloak/component/ComponentFactoryProviderFactory.java b/server-spi-private/src/main/java/org/keycloak/component/ComponentFactoryProviderFactory.java index 9942223397d..23e0aba4f90 100644 --- a/server-spi-private/src/main/java/org/keycloak/component/ComponentFactoryProviderFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/component/ComponentFactoryProviderFactory.java @@ -16,12 +16,13 @@ */ package org.keycloak.component; +import java.util.function.Function; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.InvalidationHandler; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; -import java.util.function.Function; /** * diff --git a/server-spi-private/src/main/java/org/keycloak/component/ComponentModelScope.java b/server-spi-private/src/main/java/org/keycloak/component/ComponentModelScope.java index 666527882fe..a1b89ee72ef 100644 --- a/server-spi-private/src/main/java/org/keycloak/component/ComponentModelScope.java +++ b/server-spi-private/src/main/java/org/keycloak/component/ComponentModelScope.java @@ -17,6 +17,7 @@ package org.keycloak.component; import java.util.Set; + import org.keycloak.Config.Scope; /** diff --git a/server-spi-private/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java b/server-spi-private/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java index c0169c776af..33d1e27158f 100755 --- a/server-spi-private/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/connections/httpclient/HttpClientProvider.java @@ -17,11 +17,11 @@ package org.keycloak.connections.httpclient; -import org.keycloak.provider.Provider; - import java.io.IOException; import java.io.InputStream; +import org.keycloak.provider.Provider; + import org.apache.http.impl.client.CloseableHttpClient; /** diff --git a/server-spi-private/src/main/java/org/keycloak/connections/jpa/support/EntityManagerProxy.java b/server-spi-private/src/main/java/org/keycloak/connections/jpa/support/EntityManagerProxy.java index ac18c98354d..bd1ea2d4cf7 100644 --- a/server-spi-private/src/main/java/org/keycloak/connections/jpa/support/EntityManagerProxy.java +++ b/server-spi-private/src/main/java/org/keycloak/connections/jpa/support/EntityManagerProxy.java @@ -27,18 +27,19 @@ import java.util.Set; import java.util.function.Predicate; import java.util.regex.Pattern; -import org.hibernate.exception.ConstraintViolationException; +import jakarta.persistence.EntityExistsException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.FlushModeType; +import jakarta.persistence.OptimisticLockException; +import jakarta.persistence.Query; + import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.ModelException; import org.keycloak.models.ModelIllegalStateException; -import jakarta.persistence.EntityExistsException; -import jakarta.persistence.EntityManager; -import jakarta.persistence.FlushModeType; -import jakarta.persistence.OptimisticLockException; -import jakarta.persistence.Query; +import org.hibernate.exception.ConstraintViolationException; /** * @author Stian Thorgersen diff --git a/server-spi-private/src/main/java/org/keycloak/connections/jpa/support/EntityManagers.java b/server-spi-private/src/main/java/org/keycloak/connections/jpa/support/EntityManagers.java index 1c11550f926..a0b2afbeaca 100644 --- a/server-spi-private/src/main/java/org/keycloak/connections/jpa/support/EntityManagers.java +++ b/server-spi-private/src/main/java/org/keycloak/connections/jpa/support/EntityManagers.java @@ -24,10 +24,11 @@ import java.util.Set; import java.util.function.Consumer; import java.util.stream.Stream; -import org.hibernate.Session; +import jakarta.persistence.EntityManager; + import org.keycloak.models.KeycloakSession; -import jakarta.persistence.EntityManager; +import org.hibernate.Session; public class EntityManagers { diff --git a/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProvider.java b/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProvider.java index 187faccc9ca..adcdacbc56a 100644 --- a/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProvider.java @@ -17,19 +17,19 @@ package org.keycloak.credential.hash; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.PaddingUtils; -import org.keycloak.models.PasswordPolicy; -import org.keycloak.models.credential.PasswordCredentialModel; - -import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.PBEKeySpec; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; import java.security.SecureRandom; import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; import java.util.Base64; +import javax.crypto.SecretKeyFactory; +import javax.crypto.spec.PBEKeySpec; + +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.PaddingUtils; +import org.keycloak.models.PasswordPolicy; +import org.keycloak.models.credential.PasswordCredentialModel; /** * Implementation PBKDF2 password hash algorithm. diff --git a/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProviderFactory.java b/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProviderFactory.java index aea95988cec..05d50271a5f 100644 --- a/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProviderFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/credential/hash/Pbkdf2PasswordHashProviderFactory.java @@ -17,9 +17,10 @@ package org.keycloak.credential.hash; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; +import org.jboss.logging.Logger; + /** * Provider factory for SHA1 variant of the PBKDF2 password hash algorithm. * diff --git a/server-spi-private/src/main/java/org/keycloak/crl/CrlStorageProvider.java b/server-spi-private/src/main/java/org/keycloak/crl/CrlStorageProvider.java index ba6e2838ea8..56767dc1f48 100644 --- a/server-spi-private/src/main/java/org/keycloak/crl/CrlStorageProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/crl/CrlStorageProvider.java @@ -16,12 +16,12 @@ */ package org.keycloak.crl; -import org.keycloak.provider.Provider; - import java.security.GeneralSecurityException; import java.security.cert.X509CRL; import java.util.concurrent.Callable; +import org.keycloak.provider.Provider; + /** * Crl Storage Provider interface * diff --git a/server-spi-private/src/main/java/org/keycloak/deployment/DeployedConfigurationsManager.java b/server-spi-private/src/main/java/org/keycloak/deployment/DeployedConfigurationsManager.java index 211b3364478..68a7463f9df 100644 --- a/server-spi-private/src/main/java/org/keycloak/deployment/DeployedConfigurationsManager.java +++ b/server-spi-private/src/main/java/org/keycloak/deployment/DeployedConfigurationsManager.java @@ -19,11 +19,12 @@ package org.keycloak.deployment; -import org.jboss.logging.Logger; import org.keycloak.models.AuthenticatorConfigModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; +import org.jboss.logging.Logger; + /** * Allows to CRUD for configurations (like Authenticator configs). Those are typically saved in the store (realm), but can be also * deployed and hence not saved in the DB diff --git a/server-spi-private/src/main/java/org/keycloak/device/DeviceActivityManager.java b/server-spi-private/src/main/java/org/keycloak/device/DeviceActivityManager.java index ecb70c02877..2b530cdab57 100644 --- a/server-spi-private/src/main/java/org/keycloak/device/DeviceActivityManager.java +++ b/server-spi-private/src/main/java/org/keycloak/device/DeviceActivityManager.java @@ -17,10 +17,11 @@ package org.keycloak.device; -import jakarta.ws.rs.core.HttpHeaders; import java.io.IOException; import java.util.Base64; +import jakarta.ws.rs.core.HttpHeaders; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserSessionModel; import org.keycloak.representations.account.DeviceRepresentation; diff --git a/server-spi-private/src/main/java/org/keycloak/email/EmailSenderProvider.java b/server-spi-private/src/main/java/org/keycloak/email/EmailSenderProvider.java index 64d8c1b3be8..18ca5e3ca5c 100755 --- a/server-spi-private/src/main/java/org/keycloak/email/EmailSenderProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/email/EmailSenderProvider.java @@ -17,11 +17,11 @@ package org.keycloak.email; +import java.util.Map; + import org.keycloak.models.UserModel; import org.keycloak.provider.Provider; -import java.util.Map; - /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/email/EmailTemplateProvider.java b/server-spi-private/src/main/java/org/keycloak/email/EmailTemplateProvider.java index 91160d15dc3..a12f1681bf0 100755 --- a/server-spi-private/src/main/java/org/keycloak/email/EmailTemplateProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/email/EmailTemplateProvider.java @@ -17,6 +17,9 @@ package org.keycloak.email; +import java.util.List; +import java.util.Map; + import org.keycloak.events.Event; import org.keycloak.models.OrganizationModel; import org.keycloak.models.RealmModel; @@ -24,9 +27,6 @@ import org.keycloak.models.UserModel; import org.keycloak.provider.Provider; import org.keycloak.sessions.AuthenticationSessionModel; -import java.util.List; -import java.util.Map; - /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/events/EventBuilder.java b/server-spi-private/src/main/java/org/keycloak/events/EventBuilder.java index 07e5663798e..81adb4e3a3f 100755 --- a/server-spi-private/src/main/java/org/keycloak/events/EventBuilder.java +++ b/server-spi-private/src/main/java/org/keycloak/events/EventBuilder.java @@ -17,21 +17,6 @@ package org.keycloak.events; -import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.trace.StatusCode; -import org.jboss.logging.Logger; -import org.keycloak.common.ClientConnection; -import org.keycloak.common.util.Time; -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.models.utils.KeycloakModelUtils; -import org.keycloak.tracing.TracingAttributes; -import org.keycloak.tracing.TracingProvider; - import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -43,6 +28,21 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.keycloak.common.ClientConnection; +import org.keycloak.common.util.Time; +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.models.utils.KeycloakModelUtils; +import org.keycloak.tracing.TracingAttributes; +import org.keycloak.tracing.TracingProvider; + +import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.trace.StatusCode; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/events/EventListenerTransaction.java b/server-spi-private/src/main/java/org/keycloak/events/EventListenerTransaction.java index ff07bcdef62..4b3bd9017e2 100644 --- a/server-spi-private/src/main/java/org/keycloak/events/EventListenerTransaction.java +++ b/server-spi-private/src/main/java/org/keycloak/events/EventListenerTransaction.java @@ -17,14 +17,14 @@ package org.keycloak.events; -import org.keycloak.events.admin.AdminEvent; -import org.keycloak.models.AbstractKeycloakTransaction; - import java.util.LinkedList; import java.util.List; import java.util.function.BiConsumer; import java.util.function.Consumer; +import org.keycloak.events.admin.AdminEvent; +import org.keycloak.models.AbstractKeycloakTransaction; + public class EventListenerTransaction extends AbstractKeycloakTransaction { private static class AdminEventEntry { diff --git a/server-spi-private/src/main/java/org/keycloak/events/EventType.java b/server-spi-private/src/main/java/org/keycloak/events/EventType.java index bab264f62bb..b068bce1647 100755 --- a/server-spi-private/src/main/java/org/keycloak/events/EventType.java +++ b/server-spi-private/src/main/java/org/keycloak/events/EventType.java @@ -18,6 +18,7 @@ package org.keycloak.events; import java.util.Map; + import org.keycloak.util.EnumWithStableIndex; /** diff --git a/server-spi-private/src/main/java/org/keycloak/events/admin/OperationType.java b/server-spi-private/src/main/java/org/keycloak/events/admin/OperationType.java index c82987217e6..b7893dfd16f 100755 --- a/server-spi-private/src/main/java/org/keycloak/events/admin/OperationType.java +++ b/server-spi-private/src/main/java/org/keycloak/events/admin/OperationType.java @@ -19,6 +19,7 @@ package org.keycloak.events.admin; import java.util.Map; import java.util.Objects; + import org.keycloak.util.EnumWithStableIndex; /** diff --git a/server-spi-private/src/main/java/org/keycloak/exportimport/ExportProvider.java b/server-spi-private/src/main/java/org/keycloak/exportimport/ExportProvider.java index 8f5dd5031f9..c793071e275 100755 --- a/server-spi-private/src/main/java/org/keycloak/exportimport/ExportProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/exportimport/ExportProvider.java @@ -17,10 +17,10 @@ package org.keycloak.exportimport; -import org.keycloak.provider.Provider; - import java.io.IOException; +import org.keycloak.provider.Provider; + /** * @author Marek Posolda */ diff --git a/server-spi-private/src/main/java/org/keycloak/exportimport/ImportProvider.java b/server-spi-private/src/main/java/org/keycloak/exportimport/ImportProvider.java index 801a5620f04..a354a95df2c 100755 --- a/server-spi-private/src/main/java/org/keycloak/exportimport/ImportProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/exportimport/ImportProvider.java @@ -17,10 +17,10 @@ package org.keycloak.exportimport; -import org.keycloak.provider.Provider; - import java.io.IOException; +import org.keycloak.provider.Provider; + /** * @author Marek Posolda */ diff --git a/server-spi-private/src/main/java/org/keycloak/forms/login/LoginFormsProvider.java b/server-spi-private/src/main/java/org/keycloak/forms/login/LoginFormsProvider.java index d1501fce696..fe7243dab31 100755 --- a/server-spi-private/src/main/java/org/keycloak/forms/login/LoginFormsProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/forms/login/LoginFormsProvider.java @@ -17,6 +17,14 @@ package org.keycloak.forms.login; +import java.net.URI; +import java.util.List; +import java.util.Map; +import java.util.function.Function; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.models.UserModel; import org.keycloak.models.utils.FormMessage; @@ -24,13 +32,6 @@ import org.keycloak.provider.Provider; import org.keycloak.rar.AuthorizationDetails; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.List; -import java.util.Map; -import java.util.function.Function; - /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/headers/SecurityHeadersProvider.java b/server-spi-private/src/main/java/org/keycloak/headers/SecurityHeadersProvider.java index ea16ca10417..e1937851371 100644 --- a/server-spi-private/src/main/java/org/keycloak/headers/SecurityHeadersProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/headers/SecurityHeadersProvider.java @@ -16,11 +16,11 @@ */ package org.keycloak.headers; -import org.keycloak.provider.Provider; - import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.container.ContainerResponseContext; +import org.keycloak.provider.Provider; + public interface SecurityHeadersProvider extends Provider { SecurityHeadersOptions options(); diff --git a/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttp.java b/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttp.java index 23917349ff3..a2ab3a7a2a5 100644 --- a/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttp.java +++ b/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttp.java @@ -1,10 +1,11 @@ package org.keycloak.http.simple; +import org.keycloak.connections.httpclient.HttpClientProvider; +import org.keycloak.models.KeycloakSession; + import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.http.client.HttpClient; import org.apache.http.client.config.RequestConfig; -import org.keycloak.connections.httpclient.HttpClientProvider; -import org.keycloak.models.KeycloakSession; public class SimpleHttp { diff --git a/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttpRequest.java b/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttpRequest.java index 6023987acbb..7991d017c6a 100755 --- a/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttpRequest.java +++ b/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttpRequest.java @@ -17,6 +17,17 @@ package org.keycloak.http.simple; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -40,17 +51,6 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.message.BasicNameValuePair; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * @author Stian Thorgersen * @author Vlastimil Elias (velias at redhat dot com) diff --git a/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttpResponse.java b/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttpResponse.java index 59223ceee7c..9643a59d1ba 100644 --- a/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttpResponse.java +++ b/server-spi-private/src/main/java/org/keycloak/http/simple/SimpleHttpResponse.java @@ -1,15 +1,5 @@ package org.keycloak.http.simple; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.http.Header; -import org.apache.http.HeaderIterator; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.entity.ContentType; -import org.keycloak.connections.httpclient.SafeInputStream; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -21,6 +11,17 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.zip.GZIPInputStream; +import org.keycloak.connections.httpclient.SafeInputStream; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.http.Header; +import org.apache.http.HeaderIterator; +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.entity.ContentType; + public class SimpleHttpResponse implements AutoCloseable { private final HttpResponse response; diff --git a/server-spi-private/src/main/java/org/keycloak/keys/KeyProvider.java b/server-spi-private/src/main/java/org/keycloak/keys/KeyProvider.java index 439ce8666c8..91bf1dea95a 100644 --- a/server-spi-private/src/main/java/org/keycloak/keys/KeyProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/keys/KeyProvider.java @@ -17,11 +17,11 @@ package org.keycloak.keys; +import java.util.stream.Stream; + import org.keycloak.crypto.KeyWrapper; import org.keycloak.provider.Provider; -import java.util.stream.Stream; - /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/keys/PublicKeyStorageProvider.java b/server-spi-private/src/main/java/org/keycloak/keys/PublicKeyStorageProvider.java index 770bc8c02ad..50a78adbddb 100644 --- a/server-spi-private/src/main/java/org/keycloak/keys/PublicKeyStorageProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/keys/PublicKeyStorageProvider.java @@ -19,6 +19,7 @@ package org.keycloak.keys; import java.util.List; import java.util.function.Predicate; + import org.keycloak.crypto.KeyWrapper; import org.keycloak.provider.Provider; diff --git a/server-spi-private/src/main/java/org/keycloak/logging/MappedDiagnosticContextUtil.java b/server-spi-private/src/main/java/org/keycloak/logging/MappedDiagnosticContextUtil.java index cd335a2ec95..5872cd5606e 100644 --- a/server-spi-private/src/main/java/org/keycloak/logging/MappedDiagnosticContextUtil.java +++ b/server-spi-private/src/main/java/org/keycloak/logging/MappedDiagnosticContextUtil.java @@ -1,13 +1,14 @@ package org.keycloak.logging; -import org.jboss.logging.Logger; -import org.jboss.logging.MDC; -import org.keycloak.common.Profile; -import org.keycloak.models.KeycloakSession; - import java.util.Collection; import java.util.Collections; +import org.keycloak.common.Profile; +import org.keycloak.models.KeycloakSession; + +import org.jboss.logging.Logger; +import org.jboss.logging.MDC; + public final class MappedDiagnosticContextUtil { private static final Logger log = Logger.getLogger(MappedDiagnosticContextUtil.class); diff --git a/server-spi-private/src/main/java/org/keycloak/migration/MigrationProvider.java b/server-spi-private/src/main/java/org/keycloak/migration/MigrationProvider.java index 2a70c749334..27226c2abd6 100755 --- a/server-spi-private/src/main/java/org/keycloak/migration/MigrationProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/migration/MigrationProvider.java @@ -17,15 +17,15 @@ package org.keycloak.migration; +import java.util.List; +import java.util.Map; + import org.keycloak.models.ClientScopeModel; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.provider.Provider; import org.keycloak.representations.idm.ProtocolMapperRepresentation; -import java.util.List; -import java.util.Map; - /** * Various common utils needed for migration from older version to newer * diff --git a/server-spi-private/src/main/java/org/keycloak/migration/migrators/MigrationUtils.java b/server-spi-private/src/main/java/org/keycloak/migration/migrators/MigrationUtils.java index 2e5989555e3..cd709dca4e1 100644 --- a/server-spi-private/src/main/java/org/keycloak/migration/migrators/MigrationUtils.java +++ b/server-spi-private/src/main/java/org/keycloak/migration/migrators/MigrationUtils.java @@ -18,6 +18,7 @@ package org.keycloak.migration.migrators; import java.util.stream.Collectors; + import org.keycloak.Config; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; diff --git a/server-spi-private/src/main/java/org/keycloak/models/Constants.java b/server-spi-private/src/main/java/org/keycloak/models/Constants.java index d8fd387c3c0..2e33cfc8224 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/Constants.java +++ b/server-spi-private/src/main/java/org/keycloak/models/Constants.java @@ -17,13 +17,13 @@ package org.keycloak.models; -import org.keycloak.OAuth2Constants; -import org.keycloak.crypto.Algorithm; - import java.util.Arrays; import java.util.Collection; import java.util.regex.Pattern; +import org.keycloak.OAuth2Constants; +import org.keycloak.crypto.Algorithm; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/models/ImpersonationConstants.java b/server-spi-private/src/main/java/org/keycloak/models/ImpersonationConstants.java index 6ca57d1ce25..0994ac5ab04 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/ImpersonationConstants.java +++ b/server-spi-private/src/main/java/org/keycloak/models/ImpersonationConstants.java @@ -17,11 +17,11 @@ package org.keycloak.models; -import static org.keycloak.models.AdminRoles.IMPERSONATION; - import org.keycloak.Config; import org.keycloak.models.utils.KeycloakModelUtils; +import static org.keycloak.models.AdminRoles.IMPERSONATION; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/models/OAuth2DeviceCodeModel.java b/server-spi-private/src/main/java/org/keycloak/models/OAuth2DeviceCodeModel.java index 4ea8977c29b..e7e10ee4996 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/OAuth2DeviceCodeModel.java +++ b/server-spi-private/src/main/java/org/keycloak/models/OAuth2DeviceCodeModel.java @@ -16,12 +16,13 @@ */ package org.keycloak.models; -import org.keycloak.common.util.Time; +import java.util.HashMap; +import java.util.Map; import jakarta.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedMap; -import java.util.HashMap; -import java.util.Map; + +import org.keycloak.common.util.Time; /** * @author Hiroyuki Wada diff --git a/server-spi-private/src/main/java/org/keycloak/models/WebAuthnPolicyTwoFactorDefaults.java b/server-spi-private/src/main/java/org/keycloak/models/WebAuthnPolicyTwoFactorDefaults.java index fa8bbe07baf..014a0d5cbdf 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/WebAuthnPolicyTwoFactorDefaults.java +++ b/server-spi-private/src/main/java/org/keycloak/models/WebAuthnPolicyTwoFactorDefaults.java @@ -19,6 +19,7 @@ package org.keycloak.models; import java.util.Collections; import java.util.List; + import org.keycloak.storage.ReadOnlyException; /** diff --git a/server-spi-private/src/main/java/org/keycloak/models/delegate/ClientModelLazyDelegate.java b/server-spi-private/src/main/java/org/keycloak/models/delegate/ClientModelLazyDelegate.java index 2dd98f375cb..569f1903808 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/delegate/ClientModelLazyDelegate.java +++ b/server-spi-private/src/main/java/org/keycloak/models/delegate/ClientModelLazyDelegate.java @@ -16,6 +16,13 @@ */ package org.keycloak.models.delegate; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicMarkableReference; +import java.util.function.Supplier; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; @@ -24,13 +31,6 @@ import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicMarkableReference; -import java.util.function.Supplier; -import java.util.stream.Stream; - /** * * @author hmlnarik diff --git a/server-spi-private/src/main/java/org/keycloak/models/light/EmptyCredentialManager.java b/server-spi-private/src/main/java/org/keycloak/models/light/EmptyCredentialManager.java index 0608c2d03e6..e5dda6b4b18 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/light/EmptyCredentialManager.java +++ b/server-spi-private/src/main/java/org/keycloak/models/light/EmptyCredentialManager.java @@ -16,11 +16,12 @@ */ package org.keycloak.models.light; +import java.util.List; +import java.util.stream.Stream; + import org.keycloak.credential.CredentialInput; import org.keycloak.credential.CredentialModel; import org.keycloak.models.SubjectCredentialManager; -import java.util.List; -import java.util.stream.Stream; /** * diff --git a/server-spi-private/src/main/java/org/keycloak/models/light/LightweightConsentEntity.java b/server-spi-private/src/main/java/org/keycloak/models/light/LightweightConsentEntity.java index f9b59766b34..e135faf8631 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/light/LightweightConsentEntity.java +++ b/server-spi-private/src/main/java/org/keycloak/models/light/LightweightConsentEntity.java @@ -16,6 +16,10 @@ */ package org.keycloak.models.light; +import java.util.HashSet; +import java.util.Objects; +import java.util.Set; + import org.keycloak.common.util.Time; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; @@ -23,9 +27,6 @@ import org.keycloak.models.ModelException; import org.keycloak.models.RealmModel; import org.keycloak.models.UserConsentModel; import org.keycloak.models.utils.KeycloakModelUtils; -import java.util.HashSet; -import java.util.Objects; -import java.util.Set; /** * diff --git a/server-spi-private/src/main/java/org/keycloak/models/light/LightweightUserAdapter.java b/server-spi-private/src/main/java/org/keycloak/models/light/LightweightUserAdapter.java index ca23fdf81f0..f290b3e3102 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/light/LightweightUserAdapter.java +++ b/server-spi-private/src/main/java/org/keycloak/models/light/LightweightUserAdapter.java @@ -16,10 +16,20 @@ */ package org.keycloak.models.light; +import java.io.IOException; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.UUID; +import java.util.function.Consumer; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; -import org.keycloak.models.ClientScopeModel; import org.keycloak.common.util.SecretGenerator; +import org.keycloak.models.ClientScopeModel; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -30,18 +40,10 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserModel.RequiredAction; import org.keycloak.storage.adapter.AbstractInMemoryUserAdapter; import org.keycloak.util.JsonSerialization; + import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonIncludeProperties; -import java.io.IOException; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.UUID; -import java.util.function.Consumer; -import java.util.stream.Collectors; -import java.util.stream.Stream; /** * diff --git a/server-spi-private/src/main/java/org/keycloak/models/oid4vci/CredentialScopeModel.java b/server-spi-private/src/main/java/org/keycloak/models/oid4vci/CredentialScopeModel.java index d1ea4c0186c..c8b82192f40 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/oid4vci/CredentialScopeModel.java +++ b/server-spi-private/src/main/java/org/keycloak/models/oid4vci/CredentialScopeModel.java @@ -18,12 +18,6 @@ package org.keycloak.models.oid4vci; -import org.keycloak.constants.Oid4VciConstants; -import org.keycloak.models.ClientScopeModel; -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleModel; - import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -31,6 +25,12 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Stream; +import org.keycloak.constants.Oid4VciConstants; +import org.keycloak.models.ClientScopeModel; +import org.keycloak.models.ProtocolMapperModel; +import org.keycloak.models.RealmModel; +import org.keycloak.models.RoleModel; + import static org.keycloak.constants.Oid4VciConstants.OID4VC_PROTOCOL; /** diff --git a/server-spi-private/src/main/java/org/keycloak/models/oid4vci/Oid4vcProtocolMapperModel.java b/server-spi-private/src/main/java/org/keycloak/models/oid4vci/Oid4vcProtocolMapperModel.java index 9062427fb07..84456fbb597 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/oid4vci/Oid4vcProtocolMapperModel.java +++ b/server-spi-private/src/main/java/org/keycloak/models/oid4vci/Oid4vcProtocolMapperModel.java @@ -18,14 +18,14 @@ package org.keycloak.models.oid4vci; -import org.keycloak.models.ProtocolMapperModel; - import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; +import org.keycloak.models.ProtocolMapperModel; + /** * This class acts as delegate for a {@link ProtocolMapperModel} implementation and adds additional functionality for * OpenId4VC credentials diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/AuthenticationFlowResolver.java b/server-spi-private/src/main/java/org/keycloak/models/utils/AuthenticationFlowResolver.java index 446ffb65c9d..fea24091ad2 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/AuthenticationFlowResolver.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/AuthenticationFlowResolver.java @@ -16,7 +16,6 @@ */ package org.keycloak.models.utils; -import org.jboss.logging.Logger; import org.keycloak.models.AuthenticationFlowBindings; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.ClientModel; @@ -24,6 +23,8 @@ import org.keycloak.models.Constants; import org.keycloak.models.ModelException; import org.keycloak.sessions.AuthenticationSessionModel; +import org.jboss.logging.Logger; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/ComponentUtil.java b/server-spi-private/src/main/java/org/keycloak/models/utils/ComponentUtil.java index 655f8da08f4..d27d60cf22e 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/ComponentUtil.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/ComponentUtil.java @@ -17,7 +17,10 @@ package org.keycloak.models.utils; -import org.jboss.logging.Logger; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.component.ComponentFactory; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; @@ -30,9 +33,7 @@ import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.storage.OnCreateComponent; import org.keycloak.storage.OnUpdateComponent; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultAuthenticationFlows.java b/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultAuthenticationFlows.java index e35d97df142..40058867bce 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultAuthenticationFlows.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultAuthenticationFlows.java @@ -17,6 +17,12 @@ package org.keycloak.models.utils; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; @@ -28,12 +34,6 @@ import org.keycloak.models.RequiredCredentialModel; import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.LinkedList; - /** * @author Bill Burke diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultKeyProviders.java b/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultKeyProviders.java index 10b6b3f9f3b..4bb90305ffb 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultKeyProviders.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultKeyProviders.java @@ -17,6 +17,8 @@ package org.keycloak.models.utils; +import java.util.Objects; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.crypto.Algorithm; @@ -24,8 +26,6 @@ import org.keycloak.crypto.KeyUse; import org.keycloak.keys.KeyProvider; import org.keycloak.models.RealmModel; -import java.util.Objects; - /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultRequiredActions.java b/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultRequiredActions.java index a1ccd53a548..e97245ace82 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultRequiredActions.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/DefaultRequiredActions.java @@ -17,11 +17,6 @@ package org.keycloak.models.utils; -import org.keycloak.common.Profile; -import org.keycloak.models.RealmModel; -import org.keycloak.models.RequiredActionProviderModel; -import org.keycloak.models.UserModel; - import java.util.Arrays; import java.util.HashSet; import java.util.Objects; @@ -29,6 +24,11 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.function.Supplier; +import org.keycloak.common.Profile; +import org.keycloak.models.RealmModel; +import org.keycloak.models.RequiredActionProviderModel; +import org.keycloak.models.UserModel; + import static org.keycloak.common.Profile.isFeatureEnabled; /** diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java b/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java index 79b2b7fc5c3..4a4b75c2b7a 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/KeycloakModelUtils.java @@ -17,7 +17,34 @@ package org.keycloak.models.utils; -import org.jboss.logging.Logger; +import java.math.BigInteger; +import java.security.Key; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Base64; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.crypto.spec.SecretKeySpec; + +import jakarta.transaction.InvalidTransactionException; +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; + import org.keycloak.Config; import org.keycloak.Config.Scope; import org.keycloak.broker.social.SocialIdentityProvider; @@ -62,32 +89,7 @@ import org.keycloak.transaction.JtaTransactionManagerLookup; import org.keycloak.transaction.RequestContextHelper; import org.keycloak.utils.KeycloakSessionUtil; -import jakarta.transaction.InvalidTransactionException; -import jakarta.transaction.SystemException; -import jakarta.transaction.Transaction; -import javax.crypto.spec.SecretKeySpec; -import java.math.BigInteger; -import java.security.Key; -import java.security.KeyPair; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.Base64; -import java.util.Calendar; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Function; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; import static org.keycloak.utils.StreamsUtil.closing; diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java b/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java index 55d9c90b84d..c72a40acdda 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java @@ -17,16 +17,25 @@ package org.keycloak.models.utils; -import static java.util.Optional.ofNullable; -import static org.keycloak.models.UserModel.IS_TEMP_ADMIN_ATTR_NAME; -import static org.keycloak.models.utils.StripSecretsUtils.stripSecrets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.authentication.otp.OTPApplicationProvider; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.AuthorizationProviderFactory; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; @@ -121,20 +130,13 @@ import org.keycloak.storage.StorageId; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; + +import static java.util.Optional.ofNullable; + +import static org.keycloak.models.UserModel.IS_TEMP_ADMIN_ATTR_NAME; import static org.keycloak.models.light.LightweightUserAdapter.isLightweightUser; +import static org.keycloak.models.utils.StripSecretsUtils.stripSecrets; /** * @author Bill Burke diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/ReadOnlyUserModelDelegate.java b/server-spi-private/src/main/java/org/keycloak/models/utils/ReadOnlyUserModelDelegate.java index ee1c022ce14..71081b67d60 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/ReadOnlyUserModelDelegate.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/ReadOnlyUserModelDelegate.java @@ -16,14 +16,14 @@ */ package org.keycloak.models.utils; +import java.util.List; +import java.util.function.Function; + import org.keycloak.models.GroupModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.storage.ReadOnlyException; -import java.util.List; -import java.util.function.Function; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/RealmModelDelegate.java b/server-spi-private/src/main/java/org/keycloak/models/utils/RealmModelDelegate.java index d99baded2a6..63629c2914a 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/RealmModelDelegate.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/RealmModelDelegate.java @@ -17,6 +17,10 @@ package org.keycloak.models.utils; +import java.util.Map; +import java.util.Set; +import java.util.stream.Stream; + import org.keycloak.common.enums.SslRequired; import org.keycloak.component.ComponentModel; import org.keycloak.models.AuthenticationExecutionModel; @@ -33,8 +37,8 @@ import org.keycloak.models.OAuth2DeviceConfig; import org.keycloak.models.OTPPolicy; import org.keycloak.models.ParConfig; import org.keycloak.models.PasswordPolicy; -import org.keycloak.models.RequiredActionConfigModel; import org.keycloak.models.RealmModel; +import org.keycloak.models.RequiredActionConfigModel; import org.keycloak.models.RequiredActionProviderModel; import org.keycloak.models.RequiredCredentialModel; import org.keycloak.models.RoleModel; @@ -42,10 +46,6 @@ import org.keycloak.models.WebAuthnPolicy; import org.keycloak.provider.Provider; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.Map; -import java.util.Set; -import java.util.stream.Stream; - /** * @author Alexander Schwartz */ diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java b/server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java index 595c14d1caa..537588175ef 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/RepresentationToModel.java @@ -37,12 +37,11 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.OAuth2Constants; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.AuthorizationProviderFactory; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; @@ -132,7 +131,10 @@ import org.keycloak.storage.DatastoreProvider; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; +import org.jboss.logging.Logger; + import static java.util.Optional.ofNullable; + import static org.keycloak.models.OrganizationDomainModel.ANY_DOMAIN; import static org.keycloak.protocol.saml.util.ArtifactBindingUtils.computeArtifactBindingIdentifierString; diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/SessionExpirationUtils.java b/server-spi-private/src/main/java/org/keycloak/models/utils/SessionExpirationUtils.java index a9c6e53ff0b..6c4b5c6d140 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/SessionExpirationUtils.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/SessionExpirationUtils.java @@ -17,6 +17,7 @@ package org.keycloak.models.utils; import java.util.concurrent.TimeUnit; + import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.RealmModel; diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/StripSecretsUtils.java b/server-spi-private/src/main/java/org/keycloak/models/utils/StripSecretsUtils.java index cae4cb6529f..6501566313f 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/StripSecretsUtils.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/StripSecretsUtils.java @@ -17,6 +17,16 @@ package org.keycloak.models.utils; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.BiConsumer; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.ClientSecretConstants; import org.keycloak.models.KeycloakSession; @@ -29,16 +39,6 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.function.BiConsumer; -import java.util.regex.Pattern; -import java.util.stream.Collectors; - /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/SystemClientUtil.java b/server-spi-private/src/main/java/org/keycloak/models/utils/SystemClientUtil.java index 28425a75023..859f971a0fd 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/SystemClientUtil.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/SystemClientUtil.java @@ -17,7 +17,8 @@ package org.keycloak.models.utils; -import org.jboss.logging.Logger; +import java.util.Optional; + import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; @@ -25,7 +26,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.sessions.AuthenticationSessionModel; -import java.util.Optional; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/UserSessionModelDelegate.java b/server-spi-private/src/main/java/org/keycloak/models/utils/UserSessionModelDelegate.java index e9f328d8915..443fa3ab704 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/UserSessionModelDelegate.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/UserSessionModelDelegate.java @@ -17,14 +17,14 @@ package org.keycloak.models.utils; +import java.util.Collection; +import java.util.Map; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import java.util.Collection; -import java.util.Map; - /** * @author Alexander Schwartz */ diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java b/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java index 679035c78ee..4a7df56c585 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/MethodPropertyImpl.java @@ -17,14 +17,14 @@ package org.keycloak.models.utils.reflection; -import org.keycloak.common.util.reflections.Reflections; - import java.beans.Introspector; import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.lang.reflect.Method; import java.lang.reflect.Type; +import org.keycloak.common.util.reflections.Reflections; + /** * A bean property based on the value represented by a getter/setter method pair */ diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/Properties.java b/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/Properties.java index ebb1381942a..edb7e3b3eec 100755 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/Properties.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/Properties.java @@ -56,4 +56,3 @@ public class Properties { } } } - diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java b/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java index b9f59f58536..1303ed01a95 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java +++ b/server-spi-private/src/main/java/org/keycloak/models/utils/reflection/TypedPropertyCriteria.java @@ -85,4 +85,3 @@ public class TypedPropertyCriteria implements PropertyCriteria { return false; } } - diff --git a/server-spi-private/src/main/java/org/keycloak/models/workflow/ResourceType.java b/server-spi-private/src/main/java/org/keycloak/models/workflow/ResourceType.java index 7ac2435c39a..30874da8b28 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/workflow/ResourceType.java +++ b/server-spi-private/src/main/java/org/keycloak/models/workflow/ResourceType.java @@ -17,7 +17,9 @@ package org.keycloak.models.workflow; -import static org.keycloak.models.workflow.ResourceOperationType.toOperationType; +import java.util.List; +import java.util.Objects; +import java.util.function.BiFunction; import org.keycloak.events.Event; import org.keycloak.events.EventType; @@ -26,9 +28,7 @@ import org.keycloak.events.admin.OperationType; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderEvent; -import java.util.List; -import java.util.Objects; -import java.util.function.BiFunction; +import static org.keycloak.models.workflow.ResourceOperationType.toOperationType; public enum ResourceType { diff --git a/server-spi-private/src/main/java/org/keycloak/models/workflow/Workflow.java b/server-spi-private/src/main/java/org/keycloak/models/workflow/Workflow.java index bab2c13b537..84d1211edbe 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/workflow/Workflow.java +++ b/server-spi-private/src/main/java/org/keycloak/models/workflow/Workflow.java @@ -17,11 +17,6 @@ package org.keycloak.models.workflow; -import static java.util.Optional.ofNullable; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_ENABLED; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_ERROR; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_NAME; - import java.time.Duration; import java.util.List; import java.util.Map; @@ -36,6 +31,12 @@ import org.keycloak.models.RealmModel; import org.keycloak.representations.workflows.WorkflowStepRepresentation; import org.keycloak.utils.StringUtil; +import static java.util.Optional.ofNullable; + +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_ENABLED; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_ERROR; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_NAME; + public class Workflow { private final RealmModel realm; diff --git a/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowConditionProvider.java b/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowConditionProvider.java index 375fabefadc..b300c5f37d8 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowConditionProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowConditionProvider.java @@ -4,6 +4,7 @@ import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.CriteriaQuery; import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Root; + import org.keycloak.provider.Provider; public interface WorkflowConditionProvider extends Provider { diff --git a/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowExecutor.java b/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowExecutor.java index fe67baccc27..e7e1647114e 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowExecutor.java +++ b/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowExecutor.java @@ -5,10 +5,11 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakTransaction; +import org.jboss.logging.Logger; + final class WorkflowExecutor { private static final Logger log = Logger.getLogger(WorkflowExecutor.class); diff --git a/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowStep.java b/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowStep.java index b449e872490..49492fc4a20 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowStep.java +++ b/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowStep.java @@ -17,14 +17,14 @@ package org.keycloak.models.workflow; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_AFTER; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_PRIORITY; - import java.util.Objects; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_AFTER; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_PRIORITY; + public class WorkflowStep implements Comparable { private String id; diff --git a/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowTransactionalTask.java b/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowTransactionalTask.java index 64ba0fb4bda..1ae16eeaed5 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowTransactionalTask.java +++ b/server-spi-private/src/main/java/org/keycloak/models/workflow/WorkflowTransactionalTask.java @@ -1,7 +1,5 @@ package org.keycloak.models.workflow; -import static org.keycloak.models.utils.KeycloakModelUtils.runJobInTransaction; - import java.util.Objects; import org.keycloak.models.KeycloakContext; @@ -9,6 +7,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.KeycloakSessionTask; +import static org.keycloak.models.utils.KeycloakModelUtils.runJobInTransaction; + public abstract class WorkflowTransactionalTask implements Runnable, KeycloakSessionTask { private final KeycloakSessionFactory sessionFactory; diff --git a/server-spi-private/src/main/java/org/keycloak/policy/AgePasswordPolicyProvider.java b/server-spi-private/src/main/java/org/keycloak/policy/AgePasswordPolicyProvider.java index be1e641d4aa..f26101a385e 100644 --- a/server-spi-private/src/main/java/org/keycloak/policy/AgePasswordPolicyProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/policy/AgePasswordPolicyProvider.java @@ -17,6 +17,8 @@ package org.keycloak.policy; +import java.time.Duration; + import org.keycloak.common.util.Time; import org.keycloak.credential.hash.PasswordHashProvider; import org.keycloak.models.KeycloakSession; @@ -24,9 +26,8 @@ import org.keycloak.models.PasswordPolicy; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.credential.PasswordCredentialModel; -import org.jboss.logging.Logger; -import java.time.Duration; +import org.jboss.logging.Logger; /** * @author Maciej Mierzwa diff --git a/server-spi-private/src/main/java/org/keycloak/policy/BlacklistPasswordPolicyProviderFactory.java b/server-spi-private/src/main/java/org/keycloak/policy/BlacklistPasswordPolicyProviderFactory.java index f48655a390f..518ec214aca 100644 --- a/server-spi-private/src/main/java/org/keycloak/policy/BlacklistPasswordPolicyProviderFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/policy/BlacklistPasswordPolicyProviderFactory.java @@ -17,13 +17,6 @@ package org.keycloak.policy; -import com.google.common.hash.BloomFilter; -import com.google.common.hash.Funnels; -import org.jboss.logging.Logger; -import org.keycloak.Config; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; - import java.io.BufferedReader; import java.io.File; import java.io.IOException; @@ -36,6 +29,14 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.function.Supplier; +import org.keycloak.Config; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; + +import com.google.common.hash.BloomFilter; +import com.google.common.hash.Funnels; +import org.jboss.logging.Logger; + /** * Creates {@link BlacklistPasswordPolicyProvider} instances. *

diff --git a/server-spi-private/src/main/java/org/keycloak/policy/DefaultPasswordPolicyManagerProvider.java b/server-spi-private/src/main/java/org/keycloak/policy/DefaultPasswordPolicyManagerProvider.java index b1bfc0c1ab8..8d271c4fb3d 100644 --- a/server-spi-private/src/main/java/org/keycloak/policy/DefaultPasswordPolicyManagerProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/policy/DefaultPasswordPolicyManagerProvider.java @@ -17,14 +17,14 @@ package org.keycloak.policy; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.PasswordPolicy; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import java.util.LinkedList; -import java.util.List; - /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/policy/HistoryPasswordPolicyProvider.java b/server-spi-private/src/main/java/org/keycloak/policy/HistoryPasswordPolicyProvider.java index e096436cf59..2040ad39d1e 100644 --- a/server-spi-private/src/main/java/org/keycloak/policy/HistoryPasswordPolicyProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/policy/HistoryPasswordPolicyProvider.java @@ -17,7 +17,8 @@ package org.keycloak.policy; -import org.jboss.logging.Logger; +import java.util.stream.Stream; + import org.keycloak.credential.CredentialModel; import org.keycloak.credential.hash.PasswordHashProvider; import org.keycloak.models.KeycloakSession; @@ -26,7 +27,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.credential.PasswordCredentialModel; -import java.util.stream.Stream; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/server-spi-private/src/main/java/org/keycloak/policy/MaxAuthAgePasswordPolicyProviderFactory.java b/server-spi-private/src/main/java/org/keycloak/policy/MaxAuthAgePasswordPolicyProviderFactory.java index 30dca87c3b3..4a564471d66 100644 --- a/server-spi-private/src/main/java/org/keycloak/policy/MaxAuthAgePasswordPolicyProviderFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/policy/MaxAuthAgePasswordPolicyProviderFactory.java @@ -90,4 +90,3 @@ public class MaxAuthAgePasswordPolicyProviderFactory implements PasswordPolicyPr } } - diff --git a/server-spi-private/src/main/java/org/keycloak/policy/RegexPatternsPasswordPolicyProvider.java b/server-spi-private/src/main/java/org/keycloak/policy/RegexPatternsPasswordPolicyProvider.java index 1a66020fbca..3064d03c532 100644 --- a/server-spi-private/src/main/java/org/keycloak/policy/RegexPatternsPasswordPolicyProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/policy/RegexPatternsPasswordPolicyProvider.java @@ -17,14 +17,14 @@ package org.keycloak.policy; -import org.keycloak.models.KeycloakContext; -import org.keycloak.models.RealmModel; -import org.keycloak.models.UserModel; - import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import org.keycloak.models.KeycloakContext; +import org.keycloak.models.RealmModel; +import org.keycloak.models.UserModel; + /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/AbstractLoginProtocolFactory.java b/server-spi-private/src/main/java/org/keycloak/protocol/AbstractLoginProtocolFactory.java index 661ab1034c2..e1dac8208a2 100755 --- a/server-spi-private/src/main/java/org/keycloak/protocol/AbstractLoginProtocolFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/AbstractLoginProtocolFactory.java @@ -17,6 +17,12 @@ package org.keycloak.protocol; +import java.util.Objects; +import java.util.Set; +import java.util.function.Consumer; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.Config; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; @@ -26,12 +32,6 @@ import org.keycloak.provider.ProviderEvent; import org.keycloak.provider.ProviderEventListener; import org.keycloak.representations.idm.ClientScopeRepresentation; -import java.util.Objects; -import java.util.Set; -import java.util.function.Consumer; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/ClientData.java b/server-spi-private/src/main/java/org/keycloak/protocol/ClientData.java index 55ad3221143..5a3ec46b194 100644 --- a/server-spi-private/src/main/java/org/keycloak/protocol/ClientData.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/ClientData.java @@ -21,12 +21,13 @@ package org.keycloak.protocol; import java.io.IOException; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.jboss.logging.Logger; import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.ObjectUtil; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; + /** * Encapsulates necessary data about client login request (OIDC or SAML request). Can be useful for cases when authenticationSession * expired and we need to redirect back to the client with the error due to this. diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/ClientInstallationProvider.java b/server-spi-private/src/main/java/org/keycloak/protocol/ClientInstallationProvider.java index fd57f9a4d92..b6a459ae752 100755 --- a/server-spi-private/src/main/java/org/keycloak/protocol/ClientInstallationProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/ClientInstallationProvider.java @@ -17,15 +17,16 @@ package org.keycloak.protocol; +import java.net.URI; + +import jakarta.ws.rs.core.Response; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; -import jakarta.ws.rs.core.Response; -import java.net.URI; - /** * Provides a template/sample client config adapter file. For example keycloak.json for our OIDC adapter. keycloak-saml.xml for our SAML client adapter * diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java b/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java index 9d5c452825a..b58ee97a812 100755 --- a/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocol.java @@ -17,6 +17,10 @@ package org.keycloak.protocol; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.events.EventBuilder; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; @@ -27,10 +31,6 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.provider.Provider; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocolFactory.java b/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocolFactory.java index d748aff4de1..3333d26a72b 100755 --- a/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocolFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/LoginProtocolFactory.java @@ -17,6 +17,8 @@ package org.keycloak.protocol; +import java.util.Map; + import org.keycloak.events.EventBuilder; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -26,8 +28,6 @@ import org.keycloak.provider.ProviderFactory; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeContext.java b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeContext.java index 7555a7f78e4..cffa11a6255 100644 --- a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeContext.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeContext.java @@ -17,6 +17,13 @@ */ package org.keycloak.protocol.oidc; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.OAuth2Constants; import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; @@ -25,13 +32,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.services.cors.Cors; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MultivaluedMap; - -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Token exchange context * diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeProvider.java b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeProvider.java index c9ab17301c0..62bbb253ff1 100644 --- a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenExchangeProvider.java @@ -17,10 +17,10 @@ */ package org.keycloak.protocol.oidc; -import org.keycloak.provider.Provider; - import jakarta.ws.rs.core.Response; +import org.keycloak.provider.Provider; + /** * Provides token exchange mechanism for supported tokens * diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenIntrospectionProvider.java b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenIntrospectionProvider.java index 190ad4d68a8..5b88be55df1 100644 --- a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenIntrospectionProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/TokenIntrospectionProvider.java @@ -17,11 +17,11 @@ */ package org.keycloak.protocol.oidc; +import jakarta.ws.rs.core.Response; + import org.keycloak.events.EventBuilder; import org.keycloak.provider.Provider; -import jakarta.ws.rs.core.Response; - /** * Provides introspection for a determined OAuth2 token type. * diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/grants/OAuth2GrantType.java b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/grants/OAuth2GrantType.java index eb18ccf2d48..df9c16ccf9c 100644 --- a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/grants/OAuth2GrantType.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/grants/OAuth2GrantType.java @@ -17,15 +17,15 @@ package org.keycloak.protocol.oidc.grants; +import java.util.Collections; +import java.util.Map; +import java.util.Set; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import java.util.Collections; -import java.util.Map; -import java.util.Set; - import org.keycloak.OAuth2Constants; import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; @@ -36,9 +36,9 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; +import org.keycloak.protocol.LoginProtocol; import org.keycloak.provider.Provider; import org.keycloak.services.cors.Cors; -import org.keycloak.protocol.LoginProtocol; /** * Provider interface for OAuth 2.0 grant types diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/rar/AuthorizationDetailsProcessor.java b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/rar/AuthorizationDetailsProcessor.java index 4551dd1afa8..1e999a55a56 100644 --- a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/rar/AuthorizationDetailsProcessor.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/rar/AuthorizationDetailsProcessor.java @@ -16,13 +16,13 @@ */ package org.keycloak.protocol.oidc.rar; -import org.keycloak.models.UserSessionModel; -import org.keycloak.models.ClientSessionContext; -import org.keycloak.provider.Provider; -import org.keycloak.OAuthErrorException; - import java.util.List; +import org.keycloak.OAuthErrorException; +import org.keycloak.models.ClientSessionContext; +import org.keycloak.models.UserSessionModel; +import org.keycloak.provider.Provider; + /** * Provider interface for processing authorization_details parameter in OAuth2/OIDC authorization and token requests. * This follows the RAR (Rich Authorization Requests) specification and allows different diff --git a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/rar/AuthorizationDetailsResponse.java b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/rar/AuthorizationDetailsResponse.java index b115e81f2e3..07621b79b88 100644 --- a/server-spi-private/src/main/java/org/keycloak/protocol/oidc/rar/AuthorizationDetailsResponse.java +++ b/server-spi-private/src/main/java/org/keycloak/protocol/oidc/rar/AuthorizationDetailsResponse.java @@ -16,13 +16,13 @@ */ package org.keycloak.protocol.oidc.rar; +import java.util.HashMap; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; -import java.util.HashMap; -import java.util.Map; - /** * Generic response object for authorization details processing. * This class serves as a base for different types of authorization details responses diff --git a/server-spi-private/src/main/java/org/keycloak/provider/ConfigurationValidationHelper.java b/server-spi-private/src/main/java/org/keycloak/provider/ConfigurationValidationHelper.java index ee9da044327..28139e266b5 100644 --- a/server-spi-private/src/main/java/org/keycloak/provider/ConfigurationValidationHelper.java +++ b/server-spi-private/src/main/java/org/keycloak/provider/ConfigurationValidationHelper.java @@ -17,12 +17,12 @@ package org.keycloak.provider; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; import org.keycloak.utils.StringUtil; -import java.util.List; - /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/scripting/InvocableScriptAdapter.java b/server-spi-private/src/main/java/org/keycloak/scripting/InvocableScriptAdapter.java index 17bb4a1822a..c600a3edadb 100644 --- a/server-spi-private/src/main/java/org/keycloak/scripting/InvocableScriptAdapter.java +++ b/server-spi-private/src/main/java/org/keycloak/scripting/InvocableScriptAdapter.java @@ -16,12 +16,12 @@ */ package org.keycloak.scripting; -import org.keycloak.models.ScriptModel; - import javax.script.Invocable; import javax.script.ScriptEngine; import javax.script.ScriptException; +import org.keycloak.models.ScriptModel; + /** * Wraps a {@link ScriptModel} and makes it {@link Invocable}. * diff --git a/server-spi-private/src/main/java/org/keycloak/scripting/ScriptCompilationException.java b/server-spi-private/src/main/java/org/keycloak/scripting/ScriptCompilationException.java index 27af66f569a..105c9e177e5 100644 --- a/server-spi-private/src/main/java/org/keycloak/scripting/ScriptCompilationException.java +++ b/server-spi-private/src/main/java/org/keycloak/scripting/ScriptCompilationException.java @@ -16,10 +16,10 @@ */ package org.keycloak.scripting; -import org.keycloak.models.ScriptModel; - import javax.script.ScriptException; +import org.keycloak.models.ScriptModel; + /** * Indicates compilation problems reported by a {@link ScriptException} and adds additional metadata. * diff --git a/server-spi-private/src/main/java/org/keycloak/scripting/ScriptExecutionException.java b/server-spi-private/src/main/java/org/keycloak/scripting/ScriptExecutionException.java index 2063bd21b90..5975ad08db7 100644 --- a/server-spi-private/src/main/java/org/keycloak/scripting/ScriptExecutionException.java +++ b/server-spi-private/src/main/java/org/keycloak/scripting/ScriptExecutionException.java @@ -16,10 +16,10 @@ */ package org.keycloak.scripting; -import org.keycloak.models.ScriptModel; - import javax.script.ScriptException; +import org.keycloak.models.ScriptModel; + /** * Augments a {@link ScriptException} and adds additional metadata. * diff --git a/server-spi-private/src/main/java/org/keycloak/scripting/ScriptingProvider.java b/server-spi-private/src/main/java/org/keycloak/scripting/ScriptingProvider.java index ef2990f6ca7..ad175741669 100644 --- a/server-spi-private/src/main/java/org/keycloak/scripting/ScriptingProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/scripting/ScriptingProvider.java @@ -16,11 +16,11 @@ */ package org.keycloak.scripting; +import javax.script.ScriptEngine; + import org.keycloak.models.ScriptModel; import org.keycloak.provider.Provider; -import javax.script.ScriptEngine; - /** * A {@link Provider} than provides Scripting capabilities. * diff --git a/server-spi-private/src/main/java/org/keycloak/securityprofile/SecurityProfileProvider.java b/server-spi-private/src/main/java/org/keycloak/securityprofile/SecurityProfileProvider.java index 730339bb53a..4fc0e19f205 100644 --- a/server-spi-private/src/main/java/org/keycloak/securityprofile/SecurityProfileProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/securityprofile/SecurityProfileProvider.java @@ -17,6 +17,7 @@ package org.keycloak.securityprofile; import java.util.List; + import org.keycloak.provider.Provider; import org.keycloak.representations.idm.ClientPolicyRepresentation; import org.keycloak.representations.idm.ClientProfileRepresentation; diff --git a/server-spi-private/src/main/java/org/keycloak/services/clientpolicy/executor/ClientPolicyExecutorProvider.java b/server-spi-private/src/main/java/org/keycloak/services/clientpolicy/executor/ClientPolicyExecutorProvider.java index 42f2b588ca9..6ff10105bd3 100644 --- a/server-spi-private/src/main/java/org/keycloak/services/clientpolicy/executor/ClientPolicyExecutorProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/services/clientpolicy/executor/ClientPolicyExecutorProvider.java @@ -19,9 +19,9 @@ package org.keycloak.services.clientpolicy.executor; import org.keycloak.provider.Provider; import org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation; -import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyEvent; +import org.keycloak.services.clientpolicy.ClientPolicyException; /** * This executor specifies what action is executed on the client to which a client policy is adopted. diff --git a/server-spi-private/src/main/java/org/keycloak/services/clientpolicy/executor/ClientPolicyExecutorSpi.java b/server-spi-private/src/main/java/org/keycloak/services/clientpolicy/executor/ClientPolicyExecutorSpi.java index 3ecda8eca27..8f4c7b9d0b6 100644 --- a/server-spi-private/src/main/java/org/keycloak/services/clientpolicy/executor/ClientPolicyExecutorSpi.java +++ b/server-spi-private/src/main/java/org/keycloak/services/clientpolicy/executor/ClientPolicyExecutorSpi.java @@ -49,4 +49,3 @@ public class ClientPolicyExecutorSpi implements Spi { } } - diff --git a/server-spi-private/src/main/java/org/keycloak/services/managers/BruteForceProtector.java b/server-spi-private/src/main/java/org/keycloak/services/managers/BruteForceProtector.java index 0eefdc38e4c..109e9127cb5 100755 --- a/server-spi-private/src/main/java/org/keycloak/services/managers/BruteForceProtector.java +++ b/server-spi-private/src/main/java/org/keycloak/services/managers/BruteForceProtector.java @@ -18,6 +18,7 @@ package org.keycloak.services.managers; import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.ClientConnection; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/server-spi-private/src/main/java/org/keycloak/services/scheduled/ScheduledTaskRunner.java b/server-spi-private/src/main/java/org/keycloak/services/scheduled/ScheduledTaskRunner.java index 852ff68d92b..48df6274ca2 100644 --- a/server-spi-private/src/main/java/org/keycloak/services/scheduled/ScheduledTaskRunner.java +++ b/server-spi-private/src/main/java/org/keycloak/services/scheduled/ScheduledTaskRunner.java @@ -17,7 +17,6 @@ package org.keycloak.services.scheduled; -import org.jboss.logging.Logger; import org.keycloak.logging.MappedDiagnosticContextUtil; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; @@ -26,6 +25,8 @@ import org.keycloak.timer.ScheduledTask; import org.keycloak.timer.TaskRunner; import org.keycloak.tracing.TracingProvider; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/services/ui/extend/UiTabProviderFactory.java b/server-spi-private/src/main/java/org/keycloak/services/ui/extend/UiTabProviderFactory.java index 6587192081e..e4c4faf760d 100644 --- a/server-spi-private/src/main/java/org/keycloak/services/ui/extend/UiTabProviderFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/services/ui/extend/UiTabProviderFactory.java @@ -1,12 +1,12 @@ package org.keycloak.services.ui.extend; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.component.ComponentFactory; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; -import java.util.HashMap; -import java.util.Map; - public interface UiTabProviderFactory extends ComponentFactory { default T create(KeycloakSession session, ComponentModel model) { return null; diff --git a/server-spi-private/src/main/java/org/keycloak/storage/ExportImportManager.java b/server-spi-private/src/main/java/org/keycloak/storage/ExportImportManager.java index 6b628462fef..84ec4e43aac 100644 --- a/server-spi-private/src/main/java/org/keycloak/storage/ExportImportManager.java +++ b/server-spi-private/src/main/java/org/keycloak/storage/ExportImportManager.java @@ -17,6 +17,8 @@ package org.keycloak.storage; +import java.io.InputStream; + import org.keycloak.exportimport.ExportAdapter; import org.keycloak.exportimport.ExportOptions; import org.keycloak.models.RealmModel; @@ -25,8 +27,6 @@ import org.keycloak.partialimport.PartialImportResults; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import java.io.InputStream; - /** * Manage importing and updating of realms for the store. * diff --git a/server-spi-private/src/main/java/org/keycloak/storage/ImportRealmFromRepresentationEvent.java b/server-spi-private/src/main/java/org/keycloak/storage/ImportRealmFromRepresentationEvent.java index ea08a1033ca..ec4ce7d8e1d 100644 --- a/server-spi-private/src/main/java/org/keycloak/storage/ImportRealmFromRepresentationEvent.java +++ b/server-spi-private/src/main/java/org/keycloak/storage/ImportRealmFromRepresentationEvent.java @@ -67,4 +67,3 @@ public class ImportRealmFromRepresentationEvent implements ProviderEvent { return realmModel; } } - diff --git a/server-spi-private/src/main/java/org/keycloak/storage/PartialImportRealmFromRepresentationEvent.java b/server-spi-private/src/main/java/org/keycloak/storage/PartialImportRealmFromRepresentationEvent.java index 503de61349f..d84c7f3142d 100644 --- a/server-spi-private/src/main/java/org/keycloak/storage/PartialImportRealmFromRepresentationEvent.java +++ b/server-spi-private/src/main/java/org/keycloak/storage/PartialImportRealmFromRepresentationEvent.java @@ -74,4 +74,3 @@ public class PartialImportRealmFromRepresentationEvent implements ProviderEvent return realm; } } - diff --git a/server-spi-private/src/main/java/org/keycloak/storage/SetDefaultsForNewRealm.java b/server-spi-private/src/main/java/org/keycloak/storage/SetDefaultsForNewRealm.java index 93fc2b15dd5..2027cb86b13 100644 --- a/server-spi-private/src/main/java/org/keycloak/storage/SetDefaultsForNewRealm.java +++ b/server-spi-private/src/main/java/org/keycloak/storage/SetDefaultsForNewRealm.java @@ -48,4 +48,3 @@ public class SetDefaultsForNewRealm implements ProviderEvent { return realmModel; } } - diff --git a/server-spi-private/src/main/java/org/keycloak/storage/adapter/AbstractInMemoryUserAdapter.java b/server-spi-private/src/main/java/org/keycloak/storage/adapter/AbstractInMemoryUserAdapter.java index 64dda538082..1a6e10710cf 100644 --- a/server-spi-private/src/main/java/org/keycloak/storage/adapter/AbstractInMemoryUserAdapter.java +++ b/server-spi-private/src/main/java/org/keycloak/storage/adapter/AbstractInMemoryUserAdapter.java @@ -16,6 +16,13 @@ */ package org.keycloak.storage.adapter; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Stream; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.Time; import org.keycloak.models.ClientModel; @@ -30,13 +37,6 @@ import org.keycloak.models.utils.RoleUtils; import org.keycloak.storage.ReadOnlyException; import org.keycloak.storage.StorageId; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/main/java/org/keycloak/storage/role/RoleStorageProviderFactory.java b/server-spi-private/src/main/java/org/keycloak/storage/role/RoleStorageProviderFactory.java index ca88dbd7419..c848565fd6a 100644 --- a/server-spi-private/src/main/java/org/keycloak/storage/role/RoleStorageProviderFactory.java +++ b/server-spi-private/src/main/java/org/keycloak/storage/role/RoleStorageProviderFactory.java @@ -17,6 +17,11 @@ package org.keycloak.storage.role; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.component.ComponentFactory; import org.keycloak.component.ComponentModel; @@ -26,11 +31,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public interface RoleStorageProviderFactory extends ComponentFactory { diff --git a/server-spi-private/src/main/java/org/keycloak/storage/role/RoleStorageProviderSpi.java b/server-spi-private/src/main/java/org/keycloak/storage/role/RoleStorageProviderSpi.java index a2fdc79e37d..6b1ebf61220 100644 --- a/server-spi-private/src/main/java/org/keycloak/storage/role/RoleStorageProviderSpi.java +++ b/server-spi-private/src/main/java/org/keycloak/storage/role/RoleStorageProviderSpi.java @@ -17,15 +17,15 @@ package org.keycloak.storage.role; +import java.util.Collections; +import java.util.List; + import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; -import java.util.Collections; -import java.util.List; - public class RoleStorageProviderSpi implements Spi { @Override diff --git a/server-spi-private/src/main/java/org/keycloak/theme/ThemeProvider.java b/server-spi-private/src/main/java/org/keycloak/theme/ThemeProvider.java index 7909d966e6b..78418ddc6d8 100755 --- a/server-spi-private/src/main/java/org/keycloak/theme/ThemeProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/theme/ThemeProvider.java @@ -17,11 +17,11 @@ package org.keycloak.theme; -import org.keycloak.provider.Provider; - import java.io.IOException; import java.util.Set; +import org.keycloak.provider.Provider; + /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/timer/TimerProvider.java b/server-spi-private/src/main/java/org/keycloak/timer/TimerProvider.java index 93cdcf285b9..3917b82f42e 100644 --- a/server-spi-private/src/main/java/org/keycloak/timer/TimerProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/timer/TimerProvider.java @@ -17,10 +17,10 @@ package org.keycloak.timer; -import org.keycloak.provider.Provider; - import java.util.Map; +import org.keycloak.provider.Provider; + /** * @author Stian Thorgersen */ diff --git a/server-spi-private/src/main/java/org/keycloak/tracing/NoopTracingProvider.java b/server-spi-private/src/main/java/org/keycloak/tracing/NoopTracingProvider.java index 3f1a89bb83f..54c4dc5fd10 100644 --- a/server-spi-private/src/main/java/org/keycloak/tracing/NoopTracingProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/tracing/NoopTracingProvider.java @@ -17,14 +17,14 @@ package org.keycloak.tracing; +import java.util.function.Consumer; +import java.util.function.Function; + import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanBuilder; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.api.trace.TracerProvider; -import java.util.function.Consumer; -import java.util.function.Function; - /** * Return this provider when {@link org.keycloak.common.Profile.Feature#OPENTELEMETRY} is disabled */ diff --git a/server-spi-private/src/main/java/org/keycloak/tracing/TracingProvider.java b/server-spi-private/src/main/java/org/keycloak/tracing/TracingProvider.java index fc69f1a2381..1e65417ca7b 100644 --- a/server-spi-private/src/main/java/org/keycloak/tracing/TracingProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/tracing/TracingProvider.java @@ -17,16 +17,17 @@ package org.keycloak.tracing; +import java.util.function.Consumer; +import java.util.function.Function; + +import org.keycloak.common.Version; +import org.keycloak.provider.Provider; + import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanBuilder; import io.opentelemetry.api.trace.StatusCode; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Context; -import org.keycloak.common.Version; -import org.keycloak.provider.Provider; - -import java.util.function.Consumer; -import java.util.function.Function; public interface TracingProvider extends Provider { diff --git a/server-spi-private/src/main/java/org/keycloak/tracing/TracingProviderUtil.java b/server-spi-private/src/main/java/org/keycloak/tracing/TracingProviderUtil.java index 3a390172a59..ef321dee659 100644 --- a/server-spi-private/src/main/java/org/keycloak/tracing/TracingProviderUtil.java +++ b/server-spi-private/src/main/java/org/keycloak/tracing/TracingProviderUtil.java @@ -17,10 +17,11 @@ package org.keycloak.tracing; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.utils.KeycloakSessionUtil; +import org.jboss.logging.Logger; + public class TracingProviderUtil { private static final Logger log = Logger.getLogger(TracingProviderUtil.class); diff --git a/server-spi-private/src/main/java/org/keycloak/transaction/JtaTransactionManagerLookup.java b/server-spi-private/src/main/java/org/keycloak/transaction/JtaTransactionManagerLookup.java index 156da4eef0a..2e04e665c65 100644 --- a/server-spi-private/src/main/java/org/keycloak/transaction/JtaTransactionManagerLookup.java +++ b/server-spi-private/src/main/java/org/keycloak/transaction/JtaTransactionManagerLookup.java @@ -16,12 +16,12 @@ */ package org.keycloak.transaction; +import jakarta.transaction.TransactionManager; + import org.keycloak.models.KeycloakSession; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; -import jakarta.transaction.TransactionManager; - /** * JTA TransactionManager lookup * diff --git a/server-spi-private/src/main/java/org/keycloak/transaction/RequestContextHelper.java b/server-spi-private/src/main/java/org/keycloak/transaction/RequestContextHelper.java index 4ac44d53af2..b36a702d00b 100644 --- a/server-spi-private/src/main/java/org/keycloak/transaction/RequestContextHelper.java +++ b/server-spi-private/src/main/java/org/keycloak/transaction/RequestContextHelper.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Set; import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.OAuth2Constants; import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakSession; diff --git a/server-spi-private/src/main/java/org/keycloak/truststore/TruststoreProvider.java b/server-spi-private/src/main/java/org/keycloak/truststore/TruststoreProvider.java index bda694b2bb8..1d8123ab083 100755 --- a/server-spi-private/src/main/java/org/keycloak/truststore/TruststoreProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/truststore/TruststoreProvider.java @@ -17,16 +17,16 @@ package org.keycloak.truststore; -import org.keycloak.common.enums.HostnameVerificationPolicy; -import org.keycloak.provider.Provider; - -import java.security.cert.X509Certificate; import java.security.KeyStore; +import java.security.cert.X509Certificate; import java.util.List; import java.util.Map; import javax.net.ssl.SSLSocketFactory; import javax.security.auth.x500.X500Principal; +import org.keycloak.common.enums.HostnameVerificationPolicy; +import org.keycloak.provider.Provider; + /** * @author Marko Strukelj */ diff --git a/server-spi-private/src/main/java/org/keycloak/userprofile/DefaultAttributes.java b/server-spi-private/src/main/java/org/keycloak/userprofile/DefaultAttributes.java index 0bc9344344f..75e1d8c12f3 100644 --- a/server-spi-private/src/main/java/org/keycloak/userprofile/DefaultAttributes.java +++ b/server-spi-private/src/main/java/org/keycloak/userprofile/DefaultAttributes.java @@ -19,8 +19,6 @@ package org.keycloak.userprofile; -import static java.util.Collections.emptyList; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -34,7 +32,6 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.common.util.CollectionUtil; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; @@ -51,6 +48,10 @@ import org.keycloak.validate.ValidationError; import org.keycloak.validate.ValidatorConfig; import org.keycloak.validate.validators.LengthValidator; +import org.jboss.logging.Logger; + +import static java.util.Collections.emptyList; + /** *

The default implementation for {@link Attributes}. Should be reused as much as possible by the different implementations * of {@link UserProfileProvider}. diff --git a/server-spi-private/src/main/java/org/keycloak/userprofile/DefaultUserProfile.java b/server-spi-private/src/main/java/org/keycloak/userprofile/DefaultUserProfile.java index 82ccf8b6a3c..5857b4e71c3 100644 --- a/server-spi-private/src/main/java/org/keycloak/userprofile/DefaultUserProfile.java +++ b/server-spi-private/src/main/java/org/keycloak/userprofile/DefaultUserProfile.java @@ -19,11 +19,6 @@ package org.keycloak.userprofile; -import static org.keycloak.models.UserModel.DISABLED_REASON; -import static org.keycloak.models.UserModel.IS_TEMP_ADMIN_ATTR_NAME; -import static org.keycloak.userprofile.UserProfileUtil.createUserProfileMetadata; -import static org.keycloak.userprofile.UserProfileUtil.isRootAttribute; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -49,6 +44,11 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.storage.ReadOnlyException; import org.keycloak.utils.StringUtil; +import static org.keycloak.models.UserModel.DISABLED_REASON; +import static org.keycloak.models.UserModel.IS_TEMP_ADMIN_ATTR_NAME; +import static org.keycloak.userprofile.UserProfileUtil.createUserProfileMetadata; +import static org.keycloak.userprofile.UserProfileUtil.isRootAttribute; + /** *

The default implementation for {@link UserProfile}. Should be reused as much as possible by the different implementations * of {@link UserProfileProvider}. diff --git a/server-spi-private/src/main/java/org/keycloak/userprofile/UserProfileUtil.java b/server-spi-private/src/main/java/org/keycloak/userprofile/UserProfileUtil.java index b1e4c72dc05..89036507098 100644 --- a/server-spi-private/src/main/java/org/keycloak/userprofile/UserProfileUtil.java +++ b/server-spi-private/src/main/java/org/keycloak/userprofile/UserProfileUtil.java @@ -28,7 +28,6 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; import org.keycloak.provider.ConfiguredProvider; @@ -38,6 +37,8 @@ import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.representations.userprofile.config.UPGroup; import org.keycloak.validate.Validators; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/server-spi-private/src/main/java/org/keycloak/userprofile/ValidationException.java b/server-spi-private/src/main/java/org/keycloak/userprofile/ValidationException.java index 8e87b66b3d2..7f92c7f2ef9 100644 --- a/server-spi-private/src/main/java/org/keycloak/userprofile/ValidationException.java +++ b/server-spi-private/src/main/java/org/keycloak/userprofile/ValidationException.java @@ -19,7 +19,6 @@ package org.keycloak.userprofile; -import jakarta.ws.rs.core.Response; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -30,6 +29,8 @@ import java.util.Map; import java.util.function.BiFunction; import java.util.function.Consumer; +import jakarta.ws.rs.core.Response; + import org.keycloak.validate.ValidationError; /** diff --git a/server-spi-private/src/main/java/org/keycloak/utils/CredentialHelper.java b/server-spi-private/src/main/java/org/keycloak/utils/CredentialHelper.java index 39038889dd6..65fa48d44b0 100755 --- a/server-spi-private/src/main/java/org/keycloak/utils/CredentialHelper.java +++ b/server-spi-private/src/main/java/org/keycloak/utils/CredentialHelper.java @@ -17,7 +17,10 @@ package org.keycloak.utils; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.util.List; +import java.util.Objects; + import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; import org.keycloak.authentication.ClientAuthenticator; @@ -37,9 +40,7 @@ import org.keycloak.models.credential.RecoveryAuthnCodesCredentialModel; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.List; -import java.util.Objects; +import org.jboss.logging.Logger; /** * used to set an execution a state based on type. diff --git a/server-spi-private/src/main/java/org/keycloak/utils/EmailValidationUtil.java b/server-spi-private/src/main/java/org/keycloak/utils/EmailValidationUtil.java index 7bd32e23441..1012b066b9e 100644 --- a/server-spi-private/src/main/java/org/keycloak/utils/EmailValidationUtil.java +++ b/server-spi-private/src/main/java/org/keycloak/utils/EmailValidationUtil.java @@ -3,6 +3,7 @@ package org.keycloak.utils; import java.net.IDN; import java.util.regex.Matcher; import java.util.regex.Pattern; + import org.keycloak.Config; import static java.util.regex.Pattern.CASE_INSENSITIVE; diff --git a/server-spi-private/src/main/java/org/keycloak/utils/JsonUtils.java b/server-spi-private/src/main/java/org/keycloak/utils/JsonUtils.java index e0352e434ee..9a55455dd17 100644 --- a/server-spi-private/src/main/java/org/keycloak/utils/JsonUtils.java +++ b/server-spi-private/src/main/java/org/keycloak/utils/JsonUtils.java @@ -22,6 +22,7 @@ import java.util.LinkedList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; + import com.fasterxml.jackson.databind.JsonNode; /** diff --git a/server-spi-private/src/main/java/org/keycloak/utils/OCSPProvider.java b/server-spi-private/src/main/java/org/keycloak/utils/OCSPProvider.java index 577dca61275..13188bea152 100644 --- a/server-spi-private/src/main/java/org/keycloak/utils/OCSPProvider.java +++ b/server-spi-private/src/main/java/org/keycloak/utils/OCSPProvider.java @@ -29,6 +29,9 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; +import org.keycloak.connections.httpclient.HttpClientProvider; +import org.keycloak.models.KeycloakSession; + import org.apache.http.HttpHeaders; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; @@ -37,8 +40,6 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; import org.jboss.logging.Logger; import org.jboss.logging.Logger.Level; -import org.keycloak.connections.httpclient.HttpClientProvider; -import org.keycloak.models.KeycloakSession; /** diff --git a/server-spi-private/src/main/java/org/keycloak/utils/RequiredActionHelper.java b/server-spi-private/src/main/java/org/keycloak/utils/RequiredActionHelper.java index 8784ded119e..ecc1d0321c1 100644 --- a/server-spi-private/src/main/java/org/keycloak/utils/RequiredActionHelper.java +++ b/server-spi-private/src/main/java/org/keycloak/utils/RequiredActionHelper.java @@ -16,6 +16,8 @@ */ package org.keycloak.utils; +import java.util.List; + import org.keycloak.authentication.RequiredActionFactory; import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.models.KeycloakSession; @@ -24,8 +26,6 @@ import org.keycloak.models.RequiredActionProviderModel; import org.keycloak.models.utils.Base32; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * Helpers for managing RequiredActions. */ diff --git a/server-spi-private/src/main/java/org/keycloak/utils/ReservedCharValidator.java b/server-spi-private/src/main/java/org/keycloak/utils/ReservedCharValidator.java index 7b5d64bbc6a..39ab25d5df6 100644 --- a/server-spi-private/src/main/java/org/keycloak/utils/ReservedCharValidator.java +++ b/server-spi-private/src/main/java/org/keycloak/utils/ReservedCharValidator.java @@ -16,13 +16,14 @@ */ package org.keycloak.utils; -import jakarta.ws.rs.BadRequestException; -import org.jboss.logging.Logger; - import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import jakarta.ws.rs.BadRequestException; + +import org.jboss.logging.Logger; + /** * * @author Stan Silvert diff --git a/server-spi-private/src/main/java/org/keycloak/validate/validators/IsoDateValidator.java b/server-spi-private/src/main/java/org/keycloak/validate/validators/IsoDateValidator.java index 09a1b7876ad..6341aa65a38 100644 --- a/server-spi-private/src/main/java/org/keycloak/validate/validators/IsoDateValidator.java +++ b/server-spi-private/src/main/java/org/keycloak/validate/validators/IsoDateValidator.java @@ -1,5 +1,10 @@ package org.keycloak.validate.validators; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.util.Collections; +import java.util.List; + import org.keycloak.provider.ConfiguredProvider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.validate.AbstractStringValidator; @@ -7,11 +12,6 @@ import org.keycloak.validate.ValidationContext; import org.keycloak.validate.ValidationError; import org.keycloak.validate.ValidatorConfig; -import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeParseException; -import java.util.Collections; -import java.util.List; - /** * A date validator that only takes into account the format associated with the current locale. diff --git a/server-spi-private/src/main/java/org/keycloak/validate/validators/NotEmptyValidator.java b/server-spi-private/src/main/java/org/keycloak/validate/validators/NotEmptyValidator.java index 14fd198e705..ea26584ff2c 100644 --- a/server-spi-private/src/main/java/org/keycloak/validate/validators/NotEmptyValidator.java +++ b/server-spi-private/src/main/java/org/keycloak/validate/validators/NotEmptyValidator.java @@ -16,14 +16,14 @@ */ package org.keycloak.validate.validators; +import java.util.Collection; +import java.util.Map; + import org.keycloak.validate.SimpleValidator; import org.keycloak.validate.ValidationContext; import org.keycloak.validate.ValidationError; import org.keycloak.validate.ValidatorConfig; -import java.util.Collection; -import java.util.Map; - /** * Check that input value is not empty. It means it is not null for all data types. For String it also have to be * non-empty string (no trim() performed). For {@link Collection} and {@link Map} it also means it is not empty. diff --git a/server-spi-private/src/main/java/org/keycloak/validate/validators/UriValidator.java b/server-spi-private/src/main/java/org/keycloak/validate/validators/UriValidator.java index 244797c5214..09a9567b578 100644 --- a/server-spi-private/src/main/java/org/keycloak/validate/validators/UriValidator.java +++ b/server-spi-private/src/main/java/org/keycloak/validate/validators/UriValidator.java @@ -16,13 +16,6 @@ */ package org.keycloak.validate.validators; -import org.keycloak.provider.ConfiguredProvider; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.validate.AbstractSimpleValidator; -import org.keycloak.validate.ValidationContext; -import org.keycloak.validate.ValidationError; -import org.keycloak.validate.ValidatorConfig; - import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; @@ -34,6 +27,13 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.keycloak.provider.ConfiguredProvider; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.validate.AbstractSimpleValidator; +import org.keycloak.validate.ValidationContext; +import org.keycloak.validate.ValidationError; +import org.keycloak.validate.ValidatorConfig; + /** * URI validation - accepts {@link URI}, {@link URL} and single String. Null input is valid, use other validators (like * {@link NotBlankValidator} or {@link NotEmptyValidator} to force field as required. diff --git a/server-spi-private/src/main/java/org/keycloak/validation/DefaultValidationContext.java b/server-spi-private/src/main/java/org/keycloak/validation/DefaultValidationContext.java index 27022158e99..595c5f8d156 100644 --- a/server-spi-private/src/main/java/org/keycloak/validation/DefaultValidationContext.java +++ b/server-spi-private/src/main/java/org/keycloak/validation/DefaultValidationContext.java @@ -17,11 +17,11 @@ package org.keycloak.validation; -import org.keycloak.models.KeycloakSession; - import java.util.HashSet; import java.util.Set; +import org.keycloak.models.KeycloakSession; + /** * @author Vaclav Muzikar */ diff --git a/server-spi-private/src/main/java/org/keycloak/validation/ValidationUtil.java b/server-spi-private/src/main/java/org/keycloak/validation/ValidationUtil.java index b5a15c6b84f..767841a2f38 100644 --- a/server-spi-private/src/main/java/org/keycloak/validation/ValidationUtil.java +++ b/server-spi-private/src/main/java/org/keycloak/validation/ValidationUtil.java @@ -16,12 +16,12 @@ */ package org.keycloak.validation; +import jakarta.ws.rs.BadRequestException; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.oidc.OIDCClientRepresentation; -import jakarta.ws.rs.BadRequestException; - public class ValidationUtil { public static void validateClient(KeycloakSession session, ClientModel client, boolean create, ErrorHandler errorHandler) throws BadRequestException { diff --git a/server-spi-private/src/test/java/org/keycloak/broker/provider/util/IdentityBrokerStateTest.java b/server-spi-private/src/test/java/org/keycloak/broker/provider/util/IdentityBrokerStateTest.java index 3c739153e09..4df8147d041 100644 --- a/server-spi-private/src/test/java/org/keycloak/broker/provider/util/IdentityBrokerStateTest.java +++ b/server-spi-private/src/test/java/org/keycloak/broker/provider/util/IdentityBrokerStateTest.java @@ -1,12 +1,13 @@ package org.keycloak.broker.provider.util; -import org.junit.Assert; -import org.junit.Test; +import java.io.IOException; + import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.protocol.ClientData; -import java.io.IOException; +import org.junit.Assert; +import org.junit.Test; public class IdentityBrokerStateTest { diff --git a/server-spi-private/src/test/java/org/keycloak/broker/provider/util/IdentityBrokerStateTestHelpers.java b/server-spi-private/src/test/java/org/keycloak/broker/provider/util/IdentityBrokerStateTestHelpers.java index 2426c653d4f..23a32f2dbec 100644 --- a/server-spi-private/src/test/java/org/keycloak/broker/provider/util/IdentityBrokerStateTestHelpers.java +++ b/server-spi-private/src/test/java/org/keycloak/broker/provider/util/IdentityBrokerStateTestHelpers.java @@ -1,5 +1,10 @@ package org.keycloak.broker.provider.util; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.stream.Stream; + import org.keycloak.common.enums.SslRequired; import org.keycloak.component.ComponentModel; import org.keycloak.models.AuthenticationExecutionModel; @@ -25,11 +30,6 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.WebAuthnPolicy; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.stream.Stream; - public class IdentityBrokerStateTestHelpers { public static class TestClientModel implements ClientModel { diff --git a/server-spi-private/src/test/java/org/keycloak/connections/httpclient/RetryConfigTest.java b/server-spi-private/src/test/java/org/keycloak/connections/httpclient/RetryConfigTest.java index 70a14dbdf28..03db76127c4 100644 --- a/server-spi-private/src/test/java/org/keycloak/connections/httpclient/RetryConfigTest.java +++ b/server-spi-private/src/test/java/org/keycloak/connections/httpclient/RetryConfigTest.java @@ -20,9 +20,9 @@ package org.keycloak.connections.httpclient; import org.junit.Test; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; /** * Comprehensive tests for RetryConfig class. diff --git a/server-spi-private/src/test/java/org/keycloak/connections/jpa/support/EntityManagerProxyTest.java b/server-spi-private/src/test/java/org/keycloak/connections/jpa/support/EntityManagerProxyTest.java index 36d0f1f2ae5..60698046ec4 100644 --- a/server-spi-private/src/test/java/org/keycloak/connections/jpa/support/EntityManagerProxyTest.java +++ b/server-spi-private/src/test/java/org/keycloak/connections/jpa/support/EntityManagerProxyTest.java @@ -17,15 +17,15 @@ package org.keycloak.connections.jpa.support; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.lang.reflect.Proxy; import java.util.HashSet; +import jakarta.persistence.EntityManager; + import org.junit.Test; -import jakarta.persistence.EntityManager; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class EntityManagerProxyTest { diff --git a/server-spi-private/src/test/java/org/keycloak/http/simple/SimpleHttpTest.java b/server-spi-private/src/test/java/org/keycloak/http/simple/SimpleHttpTest.java index 6f4dbbb708d..1f3ace98a86 100644 --- a/server-spi-private/src/test/java/org/keycloak/http/simple/SimpleHttpTest.java +++ b/server-spi-private/src/test/java/org/keycloak/http/simple/SimpleHttpTest.java @@ -1,5 +1,16 @@ package org.keycloak.http.simple; +import java.io.IOException; +import java.net.URLEncoder; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Collection; + +import org.keycloak.common.util.SecretGenerator; +import org.keycloak.common.util.StreamUtil; +import org.keycloak.connections.httpclient.HttpClientProvider; + import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.http.HttpEntity; import org.apache.http.HttpHost; @@ -22,16 +33,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -import org.keycloak.common.util.SecretGenerator; -import org.keycloak.common.util.StreamUtil; -import org.keycloak.connections.httpclient.HttpClientProvider; - -import java.io.IOException; -import java.net.URLEncoder; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Collection; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.startsWith; diff --git a/server-spi-private/src/test/java/org/keycloak/models/BrowserSecurityHeadersTest.java b/server-spi-private/src/test/java/org/keycloak/models/BrowserSecurityHeadersTest.java index a6948c7ae69..2907146c25f 100644 --- a/server-spi-private/src/test/java/org/keycloak/models/BrowserSecurityHeadersTest.java +++ b/server-spi-private/src/test/java/org/keycloak/models/BrowserSecurityHeadersTest.java @@ -1,8 +1,10 @@ package org.keycloak.models; +import java.util.Arrays; +import java.util.List; + import org.junit.Test; -import static org.junit.Assert.assertEquals; import static org.keycloak.models.BrowserSecurityHeaders.CONTENT_SECURITY_POLICY; import static org.keycloak.models.BrowserSecurityHeaders.CONTENT_SECURITY_POLICY_REPORT_ONLY; import static org.keycloak.models.BrowserSecurityHeaders.REFERRER_POLICY; @@ -12,8 +14,7 @@ import static org.keycloak.models.BrowserSecurityHeaders.X_FRAME_OPTIONS; import static org.keycloak.models.BrowserSecurityHeaders.X_ROBOTS_TAG; import static org.keycloak.models.BrowserSecurityHeaders.realmDefaultHeaders; -import java.util.Arrays; -import java.util.List; +import static org.junit.Assert.assertEquals; public class BrowserSecurityHeadersTest { diff --git a/server-spi-private/src/test/java/org/keycloak/models/CredentialModelBackwardsCompatibilityTest.java b/server-spi-private/src/test/java/org/keycloak/models/CredentialModelBackwardsCompatibilityTest.java index c01305d4319..74468eb7346 100644 --- a/server-spi-private/src/test/java/org/keycloak/models/CredentialModelBackwardsCompatibilityTest.java +++ b/server-spi-private/src/test/java/org/keycloak/models/CredentialModelBackwardsCompatibilityTest.java @@ -20,13 +20,14 @@ package org.keycloak.models; import java.util.Arrays; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.credential.CredentialModel; import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.models.credential.PasswordCredentialModel; +import org.junit.Assert; +import org.junit.Test; + /** * @author Marek Posolda */ diff --git a/server-spi-private/src/test/java/org/keycloak/models/HmacTest.java b/server-spi-private/src/test/java/org/keycloak/models/HmacTest.java index 33940fc1af4..51a179537a1 100755 --- a/server-spi-private/src/test/java/org/keycloak/models/HmacTest.java +++ b/server-spi-private/src/test/java/org/keycloak/models/HmacTest.java @@ -17,11 +17,12 @@ package org.keycloak.models; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.models.utils.Base32; import org.keycloak.models.utils.HmacOTP; +import org.junit.Assert; +import org.junit.Test; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi-private/src/test/java/org/keycloak/models/KeycloakModelUtilsTest.java b/server-spi-private/src/test/java/org/keycloak/models/KeycloakModelUtilsTest.java index bb77431d81d..89c38813a3a 100644 --- a/server-spi-private/src/test/java/org/keycloak/models/KeycloakModelUtilsTest.java +++ b/server-spi-private/src/test/java/org/keycloak/models/KeycloakModelUtilsTest.java @@ -17,22 +17,23 @@ package org.keycloak.models; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.arrayWithSize; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RealmModelDelegate; +import org.junit.Assert; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.arrayWithSize; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + /** * @author Daniel Fesenmeyer */ diff --git a/server-spi-private/src/test/java/org/keycloak/models/ModelVersionTest.java b/server-spi-private/src/test/java/org/keycloak/models/ModelVersionTest.java index 5941be6aefc..9ba6ca490fb 100755 --- a/server-spi-private/src/test/java/org/keycloak/models/ModelVersionTest.java +++ b/server-spi-private/src/test/java/org/keycloak/models/ModelVersionTest.java @@ -17,9 +17,10 @@ package org.keycloak.models; +import org.keycloak.migration.ModelVersion; + import org.junit.Assert; import org.junit.Test; -import org.keycloak.migration.ModelVersion; /** * @author Bill Burke diff --git a/server-spi-private/src/test/java/org/keycloak/models/TotpTest.java b/server-spi-private/src/test/java/org/keycloak/models/TotpTest.java index cb0f9b1e84b..c708677e3b4 100644 --- a/server-spi-private/src/test/java/org/keycloak/models/TotpTest.java +++ b/server-spi-private/src/test/java/org/keycloak/models/TotpTest.java @@ -16,15 +16,16 @@ */ package org.keycloak.models; -import org.junit.Assert; -import org.junit.Test; +import java.nio.charset.StandardCharsets; +import java.util.Calendar; + import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.models.credential.OTPCredentialModel.SecretEncoding; import org.keycloak.models.utils.Base32; import org.keycloak.models.utils.TimeBasedOTP; -import java.nio.charset.StandardCharsets; -import java.util.Calendar; +import org.junit.Assert; +import org.junit.Test; public class TotpTest { diff --git a/server-spi-private/src/test/java/org/keycloak/models/utils/KeycloakModelUtilsTest.java b/server-spi-private/src/test/java/org/keycloak/models/utils/KeycloakModelUtilsTest.java index 43813a0e74c..5a32b818f22 100644 --- a/server-spi-private/src/test/java/org/keycloak/models/utils/KeycloakModelUtilsTest.java +++ b/server-spi-private/src/test/java/org/keycloak/models/utils/KeycloakModelUtilsTest.java @@ -20,6 +20,7 @@ package org.keycloak.models.utils; import java.nio.ByteBuffer; import java.util.Base64; import java.util.UUID; + import org.junit.Assert; import org.junit.Test; diff --git a/server-spi-private/src/test/java/org/keycloak/models/utils/SessionExpirationUtilsTest.java b/server-spi-private/src/test/java/org/keycloak/models/utils/SessionExpirationUtilsTest.java index 0a2461463a5..d847752f2a5 100644 --- a/server-spi-private/src/test/java/org/keycloak/models/utils/SessionExpirationUtilsTest.java +++ b/server-spi-private/src/test/java/org/keycloak/models/utils/SessionExpirationUtilsTest.java @@ -20,14 +20,16 @@ package org.keycloak.models.utils; import java.lang.reflect.Proxy; import java.util.HashMap; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.common.util.Time; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.RealmModel; import org.keycloak.protocol.oidc.OIDCConfigAttributes; +import org.junit.Assert; +import org.junit.Test; + /** *

Class to perform unit tests of the SessionExpirationUtils class.

* diff --git a/server-spi-private/src/test/java/org/keycloak/models/utils/StripSecretsUtilsTest.java b/server-spi-private/src/test/java/org/keycloak/models/utils/StripSecretsUtilsTest.java index 3b9f24b3d5e..99673bd3a31 100644 --- a/server-spi-private/src/test/java/org/keycloak/models/utils/StripSecretsUtilsTest.java +++ b/server-spi-private/src/test/java/org/keycloak/models/utils/StripSecretsUtilsTest.java @@ -17,7 +17,12 @@ package org.keycloak.models.utils; -import org.junit.Test; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.ClientSecretConstants; import org.keycloak.provider.ProviderConfigProperty; @@ -29,11 +34,7 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -281,4 +282,3 @@ public class StripSecretsUtilsTest { } } - diff --git a/server-spi-private/src/test/java/org/keycloak/policy/BlacklistPasswordPolicyProviderTest.java b/server-spi-private/src/test/java/org/keycloak/policy/BlacklistPasswordPolicyProviderTest.java index 83d6e913910..d6687576204 100644 --- a/server-spi-private/src/test/java/org/keycloak/policy/BlacklistPasswordPolicyProviderTest.java +++ b/server-spi-private/src/test/java/org/keycloak/policy/BlacklistPasswordPolicyProviderTest.java @@ -1,10 +1,10 @@ package org.keycloak.policy; +import java.nio.file.Paths; + import org.junit.Assert; import org.junit.Test; -import java.nio.file.Paths; - import static org.keycloak.policy.BlacklistPasswordPolicyProviderFactory.FileBasedPasswordBlacklist; public class BlacklistPasswordPolicyProviderTest { diff --git a/server-spi-private/src/test/java/org/keycloak/utils/StreamsUtilTest.java b/server-spi-private/src/test/java/org/keycloak/utils/StreamsUtilTest.java index bf8161669c4..37b38ab00f7 100644 --- a/server-spi-private/src/test/java/org/keycloak/utils/StreamsUtilTest.java +++ b/server-spi-private/src/test/java/org/keycloak/utils/StreamsUtilTest.java @@ -20,6 +20,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.stream.Stream; + import org.junit.Assert; import org.junit.Test; diff --git a/server-spi/src/main/java/org/keycloak/component/ComponentFactory.java b/server-spi/src/main/java/org/keycloak/component/ComponentFactory.java index 32f70a87b4d..aa26b821fa1 100644 --- a/server-spi/src/main/java/org/keycloak/component/ComponentFactory.java +++ b/server-spi/src/main/java/org/keycloak/component/ComponentFactory.java @@ -16,6 +16,10 @@ */ package org.keycloak.component; +import java.util.Collections; +import java.util.List; +import java.util.Map; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.provider.ConfiguredProvider; @@ -23,10 +27,6 @@ import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderFactory; -import java.util.Collections; -import java.util.List; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/component/ComponentModel.java b/server-spi/src/main/java/org/keycloak/component/ComponentModel.java index 9af7e6bb7bd..e5d2bfcae59 100755 --- a/server-spi/src/main/java/org/keycloak/component/ComponentModel.java +++ b/server-spi/src/main/java/org/keycloak/component/ComponentModel.java @@ -17,16 +17,17 @@ package org.keycloak.component; -import org.infinispan.protostream.annotations.ProtoFactory; -import org.infinispan.protostream.annotations.ProtoField; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.common.util.MultivaluedHashMap; - import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; +import org.keycloak.common.util.MultivaluedHashMap; + +import org.infinispan.protostream.annotations.ProtoFactory; +import org.infinispan.protostream.annotations.ProtoField; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * Stored configuration of a User Storage provider instance. * diff --git a/server-spi/src/main/java/org/keycloak/component/JsonConfigComponentModel.java b/server-spi/src/main/java/org/keycloak/component/JsonConfigComponentModel.java index 3ecc5ffe618..b7dd548b7ba 100644 --- a/server-spi/src/main/java/org/keycloak/component/JsonConfigComponentModel.java +++ b/server-spi/src/main/java/org/keycloak/component/JsonConfigComponentModel.java @@ -18,9 +18,10 @@ package org.keycloak.component; -import com.fasterxml.jackson.databind.JsonNode; import org.keycloak.provider.Provider; +import com.fasterxml.jackson.databind.JsonNode; + /** * Component model backed by JSON configuration. Useful for providers, which rely on JSON configuration rather than on ComponentModel, which is directly * persisted as entity in the DB (store). diff --git a/server-spi/src/main/java/org/keycloak/component/SubComponentFactory.java b/server-spi/src/main/java/org/keycloak/component/SubComponentFactory.java index 989886fe3fe..1f38a3c9023 100644 --- a/server-spi/src/main/java/org/keycloak/component/SubComponentFactory.java +++ b/server-spi/src/main/java/org/keycloak/component/SubComponentFactory.java @@ -16,13 +16,13 @@ */ package org.keycloak.component; +import java.util.List; +import java.util.Map; + import org.keycloak.models.RealmModel; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; -import java.util.Map; - /** * Useful when you want to describe config properties that are effected by the parent ComponentModel * diff --git a/server-spi/src/main/java/org/keycloak/credential/CredentialInputUpdater.java b/server-spi/src/main/java/org/keycloak/credential/CredentialInputUpdater.java index a4cf343a9d3..e86f23d3e56 100644 --- a/server-spi/src/main/java/org/keycloak/credential/CredentialInputUpdater.java +++ b/server-spi/src/main/java/org/keycloak/credential/CredentialInputUpdater.java @@ -16,11 +16,11 @@ */ package org.keycloak.credential; +import java.util.stream.Stream; + import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/credential/CredentialModel.java b/server-spi/src/main/java/org/keycloak/credential/CredentialModel.java index 43268615108..95202646ea3 100755 --- a/server-spi/src/main/java/org/keycloak/credential/CredentialModel.java +++ b/server-spi/src/main/java/org/keycloak/credential/CredentialModel.java @@ -24,10 +24,11 @@ import java.util.Comparator; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonIgnore; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.annotation.JsonIgnore; + /** * Used just in cases when we want to "directly" update or retrieve the hash or salt of user credential (For example during export/import) * diff --git a/server-spi/src/main/java/org/keycloak/credential/CredentialTypeMetadata.java b/server-spi/src/main/java/org/keycloak/credential/CredentialTypeMetadata.java index 90bb3bb4da7..11e00b3adb3 100644 --- a/server-spi/src/main/java/org/keycloak/credential/CredentialTypeMetadata.java +++ b/server-spi/src/main/java/org/keycloak/credential/CredentialTypeMetadata.java @@ -18,11 +18,12 @@ package org.keycloak.credential; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RequiredActionProviderModel; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/server-spi/src/main/java/org/keycloak/credential/UserCredentialStore.java b/server-spi/src/main/java/org/keycloak/credential/UserCredentialStore.java index b8ebedde596..b77ae6c2ea3 100644 --- a/server-spi/src/main/java/org/keycloak/credential/UserCredentialStore.java +++ b/server-spi/src/main/java/org/keycloak/credential/UserCredentialStore.java @@ -16,12 +16,12 @@ */ package org.keycloak.credential; +import java.util.stream.Stream; + import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.provider.Provider; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/http/HttpRequest.java b/server-spi/src/main/java/org/keycloak/http/HttpRequest.java index 548593ec1c5..061dd680866 100644 --- a/server-spi/src/main/java/org/keycloak/http/HttpRequest.java +++ b/server-spi/src/main/java/org/keycloak/http/HttpRequest.java @@ -18,9 +18,11 @@ package org.keycloak.http; import java.security.cert.X509Certificate; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.UriInfo; + import org.keycloak.models.KeycloakContext; /** diff --git a/server-spi/src/main/java/org/keycloak/locale/LocaleSelectorProvider.java b/server-spi/src/main/java/org/keycloak/locale/LocaleSelectorProvider.java index c8824e6d810..c6689ad87bb 100644 --- a/server-spi/src/main/java/org/keycloak/locale/LocaleSelectorProvider.java +++ b/server-spi/src/main/java/org/keycloak/locale/LocaleSelectorProvider.java @@ -16,13 +16,13 @@ */ package org.keycloak.locale; +import java.util.Locale; + import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.provider.Provider; import org.keycloak.theme.Theme; -import java.util.Locale; - public interface LocaleSelectorProvider extends Provider { String KC_LOCALE_PARAM = "kc_locale"; diff --git a/server-spi/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java b/server-spi/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java index c4b039fef88..bddb2c2f09e 100755 --- a/server-spi/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java +++ b/server-spi/src/main/java/org/keycloak/models/AuthenticationExecutionModel.java @@ -21,6 +21,7 @@ import java.io.Serializable; import java.util.Comparator; import java.util.Map; import java.util.Objects; + import org.keycloak.util.EnumWithStableIndex; /** diff --git a/server-spi/src/main/java/org/keycloak/models/ClientProvider.java b/server-spi/src/main/java/org/keycloak/models/ClientProvider.java index e43e61af592..6cf17eccbbd 100644 --- a/server-spi/src/main/java/org/keycloak/models/ClientProvider.java +++ b/server-spi/src/main/java/org/keycloak/models/ClientProvider.java @@ -16,13 +16,13 @@ */ package org.keycloak.models; -import org.keycloak.provider.Provider; -import org.keycloak.storage.client.ClientLookupProvider; - import java.util.Map; import java.util.Set; import java.util.stream.Stream; +import org.keycloak.provider.Provider; +import org.keycloak.storage.client.ClientLookupProvider; + /** * Provider of the client records. * diff --git a/server-spi/src/main/java/org/keycloak/models/ClientScopeProvider.java b/server-spi/src/main/java/org/keycloak/models/ClientScopeProvider.java index b8bd7176247..66b53030989 100644 --- a/server-spi/src/main/java/org/keycloak/models/ClientScopeProvider.java +++ b/server-spi/src/main/java/org/keycloak/models/ClientScopeProvider.java @@ -18,6 +18,7 @@ package org.keycloak.models; import java.util.Map; import java.util.stream.Stream; + import org.keycloak.provider.Provider; import org.keycloak.storage.clientscope.ClientScopeLookupProvider; diff --git a/server-spi/src/main/java/org/keycloak/models/ClientSessionContext.java b/server-spi/src/main/java/org/keycloak/models/ClientSessionContext.java index a6c637213ea..72c8ebbfb9a 100644 --- a/server-spi/src/main/java/org/keycloak/models/ClientSessionContext.java +++ b/server-spi/src/main/java/org/keycloak/models/ClientSessionContext.java @@ -17,11 +17,11 @@ package org.keycloak.models; -import org.keycloak.rar.AuthorizationRequestContext; - import java.util.Set; import java.util.stream.Stream; +import org.keycloak.rar.AuthorizationRequestContext; + /** * Request-scoped context object * diff --git a/server-spi/src/main/java/org/keycloak/models/DefaultActionTokenKey.java b/server-spi/src/main/java/org/keycloak/models/DefaultActionTokenKey.java index 65f46c6a695..798ac7782a4 100644 --- a/server-spi/src/main/java/org/keycloak/models/DefaultActionTokenKey.java +++ b/server-spi/src/main/java/org/keycloak/models/DefaultActionTokenKey.java @@ -16,14 +16,16 @@ */ package org.keycloak.models; -import org.keycloak.representations.JsonWebToken; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.UUID; import java.util.regex.Pattern; +import org.keycloak.representations.JsonWebToken; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * * @author hmlnarik diff --git a/server-spi/src/main/java/org/keycloak/models/GroupModel.java b/server-spi/src/main/java/org/keycloak/models/GroupModel.java index a697eaef161..953cdfa090c 100755 --- a/server-spi/src/main/java/org/keycloak/models/GroupModel.java +++ b/server-spi/src/main/java/org/keycloak/models/GroupModel.java @@ -17,13 +17,13 @@ package org.keycloak.models; -import org.keycloak.provider.ProviderEvent; - import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.stream.Stream; +import org.keycloak.provider.ProviderEvent; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/models/GroupProvider.java b/server-spi/src/main/java/org/keycloak/models/GroupProvider.java index e1bd6524d88..d3a687d6853 100644 --- a/server-spi/src/main/java/org/keycloak/models/GroupProvider.java +++ b/server-spi/src/main/java/org/keycloak/models/GroupProvider.java @@ -17,12 +17,12 @@ package org.keycloak.models; +import java.util.stream.Stream; + import org.keycloak.models.GroupModel.Type; import org.keycloak.provider.Provider; import org.keycloak.storage.group.GroupLookupProvider; -import java.util.stream.Stream; - /** * * Provider of group records diff --git a/server-spi/src/main/java/org/keycloak/models/IdentityProviderMapperModel.java b/server-spi/src/main/java/org/keycloak/models/IdentityProviderMapperModel.java index ad739521626..f09993e941e 100755 --- a/server-spi/src/main/java/org/keycloak/models/IdentityProviderMapperModel.java +++ b/server-spi/src/main/java/org/keycloak/models/IdentityProviderMapperModel.java @@ -17,12 +17,12 @@ package org.keycloak.models; -import org.keycloak.models.utils.MapperTypeSerializer; - import java.io.Serializable; import java.util.List; import java.util.Map; +import org.keycloak.models.utils.MapperTypeSerializer; + /** * Specifies a mapping from broker login to user data. * diff --git a/server-spi/src/main/java/org/keycloak/models/IdentityProviderModel.java b/server-spi/src/main/java/org/keycloak/models/IdentityProviderModel.java index 23df31ea67d..8519d12608a 100755 --- a/server-spi/src/main/java/org/keycloak/models/IdentityProviderModel.java +++ b/server-spi/src/main/java/org/keycloak/models/IdentityProviderModel.java @@ -16,13 +16,14 @@ */ package org.keycloak.models; -import org.keycloak.common.Profile; -import org.keycloak.common.Profile.Feature; import java.io.Serializable; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import org.keycloak.common.Profile; +import org.keycloak.common.Profile.Feature; + /** *

A model type representing the configuration for identity providers. It provides some common properties and also a {@link org.keycloak.models.IdentityProviderModel#config} * for configuration options and properties specifics to a identity provider.

diff --git a/server-spi/src/main/java/org/keycloak/models/IdentityProviderStorageProvider.java b/server-spi/src/main/java/org/keycloak/models/IdentityProviderStorageProvider.java index 1775d080ebf..71cf27f9359 100644 --- a/server-spi/src/main/java/org/keycloak/models/IdentityProviderStorageProvider.java +++ b/server-spi/src/main/java/org/keycloak/models/IdentityProviderStorageProvider.java @@ -23,8 +23,8 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.keycloak.util.Booleans; import org.keycloak.provider.Provider; +import org.keycloak.util.Booleans; /** * The {@link IdentityProviderStorageProvider} is concerned with the storage/retrieval of the configured identity providers diff --git a/server-spi/src/main/java/org/keycloak/models/KeyManager.java b/server-spi/src/main/java/org/keycloak/models/KeyManager.java index 24744210cf4..cb4bd834d55 100644 --- a/server-spi/src/main/java/org/keycloak/models/KeyManager.java +++ b/server-spi/src/main/java/org/keycloak/models/KeyManager.java @@ -17,18 +17,18 @@ package org.keycloak.models; -import org.keycloak.crypto.KeyUse; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.keys.SecretKeyMetadata; -import org.keycloak.keys.RsaKeyMetadata; - -import javax.crypto.SecretKey; import java.security.PrivateKey; import java.security.PublicKey; import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.List; import java.util.stream.Stream; +import javax.crypto.SecretKey; + +import org.keycloak.crypto.KeyUse; +import org.keycloak.crypto.KeyWrapper; +import org.keycloak.keys.RsaKeyMetadata; +import org.keycloak.keys.SecretKeyMetadata; /** * @author Stian Thorgersen diff --git a/server-spi/src/main/java/org/keycloak/models/KeycloakContext.java b/server-spi/src/main/java/org/keycloak/models/KeycloakContext.java index 04d9b9f8bdc..f32a21bc287 100755 --- a/server-spi/src/main/java/org/keycloak/models/KeycloakContext.java +++ b/server-spi/src/main/java/org/keycloak/models/KeycloakContext.java @@ -17,6 +17,11 @@ package org.keycloak.models; +import java.net.URI; +import java.util.Locale; + +import jakarta.ws.rs.core.HttpHeaders; + import org.keycloak.Token; import org.keycloak.common.ClientConnection; import org.keycloak.http.HttpRequest; @@ -25,10 +30,6 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.theme.Theme; import org.keycloak.urls.UrlType; -import jakarta.ws.rs.core.HttpHeaders; -import java.net.URI; -import java.util.Locale; - /** * @author Stian Thorgersen */ diff --git a/server-spi/src/main/java/org/keycloak/models/KeycloakSession.java b/server-spi/src/main/java/org/keycloak/models/KeycloakSession.java index 38264bb084e..7320479841a 100755 --- a/server-spi/src/main/java/org/keycloak/models/KeycloakSession.java +++ b/server-spi/src/main/java/org/keycloak/models/KeycloakSession.java @@ -17,6 +17,10 @@ package org.keycloak.models; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; + import org.keycloak.component.ComponentModel; import org.keycloak.provider.InvalidationHandler.InvalidableObjectType; import org.keycloak.provider.Provider; @@ -24,10 +28,6 @@ import org.keycloak.services.clientpolicy.ClientPolicyManager; import org.keycloak.sessions.AuthenticationSessionProvider; import org.keycloak.vault.VaultTranscriber; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/models/KeycloakSessionFactory.java b/server-spi/src/main/java/org/keycloak/models/KeycloakSessionFactory.java index 3753d9de052..f2a76c2ed41 100755 --- a/server-spi/src/main/java/org/keycloak/models/KeycloakSessionFactory.java +++ b/server-spi/src/main/java/org/keycloak/models/KeycloakSessionFactory.java @@ -17,6 +17,10 @@ package org.keycloak.models; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.provider.InvalidationHandler; import org.keycloak.provider.Provider; @@ -24,10 +28,6 @@ import org.keycloak.provider.ProviderEventManager; import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/models/KeycloakUriInfo.java b/server-spi/src/main/java/org/keycloak/models/KeycloakUriInfo.java index 4beabc00837..bdb2e61f8b0 100644 --- a/server-spi/src/main/java/org/keycloak/models/KeycloakUriInfo.java +++ b/server-spi/src/main/java/org/keycloak/models/KeycloakUriInfo.java @@ -16,21 +16,22 @@ */ package org.keycloak.models; -import static org.keycloak.common.util.UriUtils.parseQueryParameters; +import java.net.URI; +import java.util.List; +import java.util.Map; import jakarta.ws.rs.core.MultivaluedHashMap; - -import org.jboss.resteasy.reactive.common.jaxrs.UriBuilderImpl; -import org.keycloak.urls.HostnameProvider; -import org.keycloak.urls.UrlType; - import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.PathSegment; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import java.net.URI; -import java.util.List; -import java.util.Map; + +import org.keycloak.urls.HostnameProvider; +import org.keycloak.urls.UrlType; + +import org.jboss.resteasy.reactive.common.jaxrs.UriBuilderImpl; + +import static org.keycloak.common.util.UriUtils.parseQueryParameters; public class KeycloakUriInfo implements UriInfo { diff --git a/server-spi/src/main/java/org/keycloak/models/OTPPolicy.java b/server-spi/src/main/java/org/keycloak/models/OTPPolicy.java index fd836bef7c8..238a91bf88c 100755 --- a/server-spi/src/main/java/org/keycloak/models/OTPPolicy.java +++ b/server-spi/src/main/java/org/keycloak/models/OTPPolicy.java @@ -17,16 +17,17 @@ package org.keycloak.models; -import org.jboss.logging.Logger; +import java.io.Serializable; +import java.net.URLEncoder; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.models.utils.Base32; import org.keycloak.models.utils.HmacOTP; import org.keycloak.utils.StringUtil; -import java.io.Serializable; -import java.net.URLEncoder; -import java.util.HashMap; -import java.util.Map; +import org.jboss.logging.Logger; import static java.nio.charset.StandardCharsets.UTF_8; diff --git a/server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java b/server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java index 67deb28a280..be7873e9ba2 100755 --- a/server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java +++ b/server-spi/src/main/java/org/keycloak/models/PasswordPolicy.java @@ -17,16 +17,17 @@ package org.keycloak.models; -import org.jboss.logging.Logger; -import org.keycloak.policy.PasswordPolicyConfigException; -import org.keycloak.policy.PasswordPolicyProvider; - import java.io.Serializable; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +import org.keycloak.policy.PasswordPolicyConfigException; +import org.keycloak.policy.PasswordPolicyProvider; + +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/server-spi/src/main/java/org/keycloak/models/RealmModel.java b/server-spi/src/main/java/org/keycloak/models/RealmModel.java index 84c14d613c5..ce6d5cae8a7 100755 --- a/server-spi/src/main/java/org/keycloak/models/RealmModel.java +++ b/server-spi/src/main/java/org/keycloak/models/RealmModel.java @@ -18,16 +18,16 @@ package org.keycloak.models; import java.util.Comparator; +import java.util.Map; +import java.util.Set; +import java.util.stream.Stream; + import org.keycloak.common.enums.SslRequired; import org.keycloak.component.ComponentModel; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderEvent; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.Map; -import java.util.Set; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/models/RealmProvider.java b/server-spi/src/main/java/org/keycloak/models/RealmProvider.java index 7061327a40b..c7999298143 100755 --- a/server-spi/src/main/java/org/keycloak/models/RealmProvider.java +++ b/server-spi/src/main/java/org/keycloak/models/RealmProvider.java @@ -19,6 +19,7 @@ package org.keycloak.models; import java.util.Map; import java.util.stream.Stream; + import org.keycloak.provider.Provider; /** diff --git a/server-spi/src/main/java/org/keycloak/models/RequiredCredentialModel.java b/server-spi/src/main/java/org/keycloak/models/RequiredCredentialModel.java index 85ad4552fb2..da8a6ce9750 100755 --- a/server-spi/src/main/java/org/keycloak/models/RequiredCredentialModel.java +++ b/server-spi/src/main/java/org/keycloak/models/RequiredCredentialModel.java @@ -17,14 +17,14 @@ package org.keycloak.models; -import org.keycloak.models.credential.OTPCredentialModel; -import org.keycloak.models.credential.PasswordCredentialModel; - import java.io.Serializable; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import org.keycloak.models.credential.OTPCredentialModel; +import org.keycloak.models.credential.PasswordCredentialModel; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/models/RoleContainerModel.java b/server-spi/src/main/java/org/keycloak/models/RoleContainerModel.java index 8cff5f29403..756530fb4a8 100755 --- a/server-spi/src/main/java/org/keycloak/models/RoleContainerModel.java +++ b/server-spi/src/main/java/org/keycloak/models/RoleContainerModel.java @@ -17,10 +17,10 @@ package org.keycloak.models; -import org.keycloak.provider.ProviderEvent; - import java.util.stream.Stream; +import org.keycloak.provider.ProviderEvent; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/models/RoleModel.java b/server-spi/src/main/java/org/keycloak/models/RoleModel.java index ee6d26991cc..afe95ec349b 100755 --- a/server-spi/src/main/java/org/keycloak/models/RoleModel.java +++ b/server-spi/src/main/java/org/keycloak/models/RoleModel.java @@ -17,11 +17,12 @@ package org.keycloak.models; -import org.keycloak.provider.ProviderEvent; import java.util.List; import java.util.Map; import java.util.stream.Stream; +import org.keycloak.provider.ProviderEvent; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/models/RoleProvider.java b/server-spi/src/main/java/org/keycloak/models/RoleProvider.java index a3c242ce46a..39bd8fb3cab 100644 --- a/server-spi/src/main/java/org/keycloak/models/RoleProvider.java +++ b/server-spi/src/main/java/org/keycloak/models/RoleProvider.java @@ -17,6 +17,7 @@ package org.keycloak.models; import java.util.stream.Stream; + import org.keycloak.provider.Provider; import org.keycloak.storage.role.RoleLookupProvider; diff --git a/server-spi/src/main/java/org/keycloak/models/SingleUseObjectKeyModel.java b/server-spi/src/main/java/org/keycloak/models/SingleUseObjectKeyModel.java index 5b30da4ffcb..41dac0482d8 100644 --- a/server-spi/src/main/java/org/keycloak/models/SingleUseObjectKeyModel.java +++ b/server-spi/src/main/java/org/keycloak/models/SingleUseObjectKeyModel.java @@ -16,11 +16,12 @@ */ package org.keycloak.models; -import com.fasterxml.jackson.annotation.JsonIgnore; import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.UUID; +import com.fasterxml.jackson.annotation.JsonIgnore; + /** * * @author hmlnarik diff --git a/server-spi/src/main/java/org/keycloak/models/SingleUseObjectProvider.java b/server-spi/src/main/java/org/keycloak/models/SingleUseObjectProvider.java index 4126e0d3e0f..6b9c7dbc80a 100644 --- a/server-spi/src/main/java/org/keycloak/models/SingleUseObjectProvider.java +++ b/server-spi/src/main/java/org/keycloak/models/SingleUseObjectProvider.java @@ -17,10 +17,10 @@ package org.keycloak.models; -import org.keycloak.provider.Provider; - import java.util.Map; +import org.keycloak.provider.Provider; + /** * Provides a cache to store data for single-use use case or the details about used action tokens. * diff --git a/server-spi/src/main/java/org/keycloak/models/SubjectCredentialManager.java b/server-spi/src/main/java/org/keycloak/models/SubjectCredentialManager.java index 0d16cbcac26..ed8b9b22e7e 100644 --- a/server-spi/src/main/java/org/keycloak/models/SubjectCredentialManager.java +++ b/server-spi/src/main/java/org/keycloak/models/SubjectCredentialManager.java @@ -17,13 +17,13 @@ package org.keycloak.models; -import org.keycloak.credential.CredentialInput; -import org.keycloak.credential.CredentialModel; - import java.util.Arrays; import java.util.List; import java.util.stream.Stream; +import org.keycloak.credential.CredentialInput; +import org.keycloak.credential.CredentialModel; + /** * Validates and manages the credentials of a known entity (for example, a user). * diff --git a/server-spi/src/main/java/org/keycloak/models/ThemeManager.java b/server-spi/src/main/java/org/keycloak/models/ThemeManager.java index 267546a8256..6f6fba55249 100644 --- a/server-spi/src/main/java/org/keycloak/models/ThemeManager.java +++ b/server-spi/src/main/java/org/keycloak/models/ThemeManager.java @@ -1,11 +1,11 @@ package org.keycloak.models; -import org.keycloak.provider.Provider; -import org.keycloak.theme.Theme; - import java.io.IOException; import java.util.Set; +import org.keycloak.provider.Provider; +import org.keycloak.theme.Theme; + public interface ThemeManager extends Provider { /** diff --git a/server-spi/src/main/java/org/keycloak/models/UserCredentialModel.java b/server-spi/src/main/java/org/keycloak/models/UserCredentialModel.java index b1729df2c59..6adbd2803a9 100755 --- a/server-spi/src/main/java/org/keycloak/models/UserCredentialModel.java +++ b/server-spi/src/main/java/org/keycloak/models/UserCredentialModel.java @@ -17,16 +17,16 @@ package org.keycloak.models; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.common.util.SecretGenerator; import org.keycloak.credential.CredentialInput; import org.keycloak.credential.CredentialModel; -import org.keycloak.models.credential.RecoveryAuthnCodesCredentialModel; import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.models.credential.PasswordCredentialModel; import org.keycloak.models.credential.PasswordUserCredentialModel; - -import java.util.HashMap; -import java.util.Map; +import org.keycloak.models.credential.RecoveryAuthnCodesCredentialModel; /** * @author Bill Burke @@ -206,5 +206,3 @@ public class UserCredentialModel implements CredentialInput { } } - - diff --git a/server-spi/src/main/java/org/keycloak/models/UserModel.java b/server-spi/src/main/java/org/keycloak/models/UserModel.java index 0cac75263d9..b2308bce449 100755 --- a/server-spi/src/main/java/org/keycloak/models/UserModel.java +++ b/server-spi/src/main/java/org/keycloak/models/UserModel.java @@ -17,15 +17,15 @@ package org.keycloak.models; -import static org.keycloak.utils.StringUtil.isNotBlank; - -import org.keycloak.provider.ProviderEvent; - import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.stream.Stream; +import org.keycloak.provider.ProviderEvent; + +import static org.keycloak.utils.StringUtil.isNotBlank; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/models/UserProvider.java b/server-spi/src/main/java/org/keycloak/models/UserProvider.java index 99cefd22313..a091f5f6e88 100755 --- a/server-spi/src/main/java/org/keycloak/models/UserProvider.java +++ b/server-spi/src/main/java/org/keycloak/models/UserProvider.java @@ -17,6 +17,8 @@ package org.keycloak.models; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.provider.Provider; import org.keycloak.storage.user.UserBulkUpdateProvider; @@ -24,8 +26,6 @@ import org.keycloak.storage.user.UserLookupProvider; import org.keycloak.storage.user.UserQueryProvider; import org.keycloak.storage.user.UserRegistrationProvider; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/models/UserSessionModel.java b/server-spi/src/main/java/org/keycloak/models/UserSessionModel.java index f00f4520859..f2f8e313acd 100755 --- a/server-spi/src/main/java/org/keycloak/models/UserSessionModel.java +++ b/server-spi/src/main/java/org/keycloak/models/UserSessionModel.java @@ -17,14 +17,15 @@ package org.keycloak.models; -import org.infinispan.protostream.annotations.Proto; -import org.infinispan.protostream.annotations.ProtoTypeId; -import org.keycloak.util.EnumWithStableIndex; - import java.util.Collection; import java.util.Map; import java.util.Objects; +import org.keycloak.util.EnumWithStableIndex; + +import org.infinispan.protostream.annotations.Proto; +import org.infinispan.protostream.annotations.ProtoTypeId; + /** * @author Stian Thorgersen */ diff --git a/server-spi/src/main/java/org/keycloak/models/WebAuthnPolicy.java b/server-spi/src/main/java/org/keycloak/models/WebAuthnPolicy.java index 72456f2a981..0547a0e2aa3 100644 --- a/server-spi/src/main/java/org/keycloak/models/WebAuthnPolicy.java +++ b/server-spi/src/main/java/org/keycloak/models/WebAuthnPolicy.java @@ -22,9 +22,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.crypto.Algorithm; +import org.jboss.logging.Logger; + public class WebAuthnPolicy implements Serializable { protected static final Logger logger = Logger.getLogger(WebAuthnPolicy.class); diff --git a/server-spi/src/main/java/org/keycloak/models/credential/OTPCredentialModel.java b/server-spi/src/main/java/org/keycloak/models/credential/OTPCredentialModel.java index 8c15da25867..0e18b9be4a0 100644 --- a/server-spi/src/main/java/org/keycloak/models/credential/OTPCredentialModel.java +++ b/server-spi/src/main/java/org/keycloak/models/credential/OTPCredentialModel.java @@ -1,17 +1,17 @@ package org.keycloak.models.credential; -import org.keycloak.common.util.Time; -import org.keycloak.credential.CredentialModel; -import org.keycloak.models.credential.dto.OTPCredentialData; -import org.keycloak.models.credential.dto.OTPSecretData; -import org.keycloak.models.OTPPolicy; -import org.keycloak.models.RealmModel; -import org.keycloak.models.utils.Base32; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.nio.charset.StandardCharsets; +import org.keycloak.common.util.Time; +import org.keycloak.credential.CredentialModel; +import org.keycloak.models.OTPPolicy; +import org.keycloak.models.RealmModel; +import org.keycloak.models.credential.dto.OTPCredentialData; +import org.keycloak.models.credential.dto.OTPSecretData; +import org.keycloak.models.utils.Base32; +import org.keycloak.util.JsonSerialization; + public class OTPCredentialModel extends CredentialModel { public static final String TYPE = "otp"; diff --git a/server-spi/src/main/java/org/keycloak/models/credential/PasswordCredentialModel.java b/server-spi/src/main/java/org/keycloak/models/credential/PasswordCredentialModel.java index 2f24244e92b..9a1dd30b09f 100644 --- a/server-spi/src/main/java/org/keycloak/models/credential/PasswordCredentialModel.java +++ b/server-spi/src/main/java/org/keycloak/models/credential/PasswordCredentialModel.java @@ -1,15 +1,15 @@ package org.keycloak.models.credential; -import static org.keycloak.utils.StringUtil.isBlank; +import java.io.IOException; +import java.util.List; +import java.util.Map; import org.keycloak.credential.CredentialModel; import org.keycloak.models.credential.dto.PasswordCredentialData; import org.keycloak.models.credential.dto.PasswordSecretData; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.List; -import java.util.Map; +import static org.keycloak.utils.StringUtil.isBlank; public class PasswordCredentialModel extends CredentialModel { diff --git a/server-spi/src/main/java/org/keycloak/models/credential/WebAuthnCredentialModel.java b/server-spi/src/main/java/org/keycloak/models/credential/WebAuthnCredentialModel.java index a3f04cb0340..1502ea945ac 100644 --- a/server-spi/src/main/java/org/keycloak/models/credential/WebAuthnCredentialModel.java +++ b/server-spi/src/main/java/org/keycloak/models/credential/WebAuthnCredentialModel.java @@ -19,6 +19,8 @@ package org.keycloak.models.credential; import java.io.IOException; +import java.util.Collections; +import java.util.Set; import org.keycloak.common.util.Time; import org.keycloak.credential.CredentialModel; @@ -26,9 +28,6 @@ import org.keycloak.models.credential.dto.WebAuthnCredentialData; import org.keycloak.models.credential.dto.WebAuthnSecretData; import org.keycloak.util.JsonSerialization; -import java.util.Collections; -import java.util.Set; - /** * @author Marek Posolda */ diff --git a/server-spi/src/main/java/org/keycloak/models/credential/dto/PasswordCredentialData.java b/server-spi/src/main/java/org/keycloak/models/credential/dto/PasswordCredentialData.java index 59bd61377fe..74177544466 100644 --- a/server-spi/src/main/java/org/keycloak/models/credential/dto/PasswordCredentialData.java +++ b/server-spi/src/main/java/org/keycloak/models/credential/dto/PasswordCredentialData.java @@ -1,12 +1,13 @@ package org.keycloak.models.credential.dto; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.common.util.MultivaluedHashMap; - import java.util.List; import java.util.Map; +import org.keycloak.common.util.MultivaluedHashMap; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + public class PasswordCredentialData { private final int hashIterations; private final String algorithm; diff --git a/server-spi/src/main/java/org/keycloak/models/credential/dto/PasswordSecretData.java b/server-spi/src/main/java/org/keycloak/models/credential/dto/PasswordSecretData.java index 656ea4d6c23..c43b7ec3a32 100644 --- a/server-spi/src/main/java/org/keycloak/models/credential/dto/PasswordSecretData.java +++ b/server-spi/src/main/java/org/keycloak/models/credential/dto/PasswordSecretData.java @@ -1,15 +1,16 @@ package org.keycloak.models.credential.dto; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.jboss.logging.Logger; -import org.keycloak.common.util.MultivaluedHashMap; - import java.io.IOException; import java.util.Base64; import java.util.List; import java.util.Map; +import org.keycloak.common.util.MultivaluedHashMap; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; + public class PasswordSecretData { public static final Logger logger = Logger.getLogger(PasswordSecretData.class); diff --git a/server-spi/src/main/java/org/keycloak/models/credential/dto/RecoveryAuthnCodesSecretData.java b/server-spi/src/main/java/org/keycloak/models/credential/dto/RecoveryAuthnCodesSecretData.java index 58b47738ebe..4a317a3e079 100644 --- a/server-spi/src/main/java/org/keycloak/models/credential/dto/RecoveryAuthnCodesSecretData.java +++ b/server-spi/src/main/java/org/keycloak/models/credential/dto/RecoveryAuthnCodesSecretData.java @@ -1,10 +1,10 @@ package org.keycloak.models.credential.dto; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - public class RecoveryAuthnCodesSecretData { private final List codes; diff --git a/server-spi/src/main/java/org/keycloak/models/credential/dto/WebAuthnCredentialData.java b/server-spi/src/main/java/org/keycloak/models/credential/dto/WebAuthnCredentialData.java index 8475f2d9d90..f64c340ee7a 100644 --- a/server-spi/src/main/java/org/keycloak/models/credential/dto/WebAuthnCredentialData.java +++ b/server-spi/src/main/java/org/keycloak/models/credential/dto/WebAuthnCredentialData.java @@ -18,13 +18,13 @@ package org.keycloak.models.credential.dto; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.Arrays; import java.util.Collections; import java.util.Set; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Marek Posolda */ diff --git a/server-spi/src/main/java/org/keycloak/models/utils/HmacOTP.java b/server-spi/src/main/java/org/keycloak/models/utils/HmacOTP.java index 94de4a648a9..5b7136abae7 100755 --- a/server-spi/src/main/java/org/keycloak/models/utils/HmacOTP.java +++ b/server-spi/src/main/java/org/keycloak/models/utils/HmacOTP.java @@ -17,10 +17,10 @@ package org.keycloak.models.utils; -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; import java.math.BigInteger; import java.security.SecureRandom; +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; /** * @author Bill Burke diff --git a/server-spi/src/main/java/org/keycloak/models/utils/MapperTypeSerializer.java b/server-spi/src/main/java/org/keycloak/models/utils/MapperTypeSerializer.java index 6b0d18359b3..b8e26a509c7 100644 --- a/server-spi/src/main/java/org/keycloak/models/utils/MapperTypeSerializer.java +++ b/server-spi/src/main/java/org/keycloak/models/utils/MapperTypeSerializer.java @@ -25,9 +25,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.fasterxml.jackson.core.type.TypeReference; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.core.type.TypeReference; + import static java.util.Collections.emptyMap; /** diff --git a/server-spi/src/main/java/org/keycloak/models/utils/RecoveryAuthnCodesUtils.java b/server-spi/src/main/java/org/keycloak/models/utils/RecoveryAuthnCodesUtils.java index 2d4796dc834..78bbb23632a 100644 --- a/server-spi/src/main/java/org/keycloak/models/utils/RecoveryAuthnCodesUtils.java +++ b/server-spi/src/main/java/org/keycloak/models/utils/RecoveryAuthnCodesUtils.java @@ -3,14 +3,13 @@ package org.keycloak.models.utils; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.util.Base64; -import java.util.function.Supplier; import java.util.List; import java.util.Objects; import java.util.Optional; +import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.common.util.SecretGenerator; import org.keycloak.credential.CredentialModel; import org.keycloak.crypto.JavaAlgorithm; @@ -18,6 +17,8 @@ import org.keycloak.jose.jws.crypto.HashUtils; import org.keycloak.models.UserModel; import org.keycloak.models.credential.RecoveryAuthnCodesCredentialModel; +import org.jboss.logging.Logger; + public class RecoveryAuthnCodesUtils { diff --git a/server-spi/src/main/java/org/keycloak/models/utils/RoleUtils.java b/server-spi/src/main/java/org/keycloak/models/utils/RoleUtils.java index f1a5263c931..d3948c686d6 100644 --- a/server-spi/src/main/java/org/keycloak/models/utils/RoleUtils.java +++ b/server-spi/src/main/java/org/keycloak/models/utils/RoleUtils.java @@ -17,13 +17,6 @@ package org.keycloak.models.utils; -import org.keycloak.models.ClientModel; -import org.keycloak.models.GroupModel; -import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleContainerModel; -import org.keycloak.models.RoleModel; -import org.keycloak.models.UserModel; - import java.util.ArrayDeque; import java.util.Deque; import java.util.HashSet; @@ -32,6 +25,13 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.keycloak.models.ClientModel; +import org.keycloak.models.GroupModel; +import org.keycloak.models.RealmModel; +import org.keycloak.models.RoleContainerModel; +import org.keycloak.models.RoleModel; +import org.keycloak.models.UserModel; + /** * @author Stian Thorgersen */ diff --git a/server-spi/src/main/java/org/keycloak/models/utils/UserModelDelegate.java b/server-spi/src/main/java/org/keycloak/models/utils/UserModelDelegate.java index 3404319689d..de5e3985dd2 100755 --- a/server-spi/src/main/java/org/keycloak/models/utils/UserModelDelegate.java +++ b/server-spi/src/main/java/org/keycloak/models/utils/UserModelDelegate.java @@ -17,16 +17,16 @@ package org.keycloak.models.utils; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.GroupModel; import org.keycloak.models.RoleModel; import org.keycloak.models.SubjectCredentialManager; import org.keycloak.models.UserModel; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - /** * Delegation pattern. Used to proxy UserModel implementations. * diff --git a/server-spi/src/main/java/org/keycloak/rar/AuthorizationDetails.java b/server-spi/src/main/java/org/keycloak/rar/AuthorizationDetails.java index 3e63b62b43d..c48482782bd 100644 --- a/server-spi/src/main/java/org/keycloak/rar/AuthorizationDetails.java +++ b/server-spi/src/main/java/org/keycloak/rar/AuthorizationDetails.java @@ -16,12 +16,12 @@ */ package org.keycloak.rar; -import org.keycloak.models.ClientScopeModel; -import org.keycloak.representations.AuthorizationDetailsJSONRepresentation; - import java.io.Serializable; import java.util.Objects; +import org.keycloak.models.ClientScopeModel; +import org.keycloak.representations.AuthorizationDetailsJSONRepresentation; + /** * The internal Keycloak representation of a Rich Authorization Request authorization_details object, together with * some extra metadata to make it easier to work with this data in other parts of the codebase. diff --git a/server-spi/src/main/java/org/keycloak/sessions/AuthenticationSessionProvider.java b/server-spi/src/main/java/org/keycloak/sessions/AuthenticationSessionProvider.java index d3a0f18fb75..8162140902f 100644 --- a/server-spi/src/main/java/org/keycloak/sessions/AuthenticationSessionProvider.java +++ b/server-spi/src/main/java/org/keycloak/sessions/AuthenticationSessionProvider.java @@ -17,12 +17,12 @@ package org.keycloak.sessions; +import java.util.Map; + import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.provider.Provider; -import java.util.Map; - /** * @author Marek Posolda */ diff --git a/server-spi/src/main/java/org/keycloak/sessions/CommonClientSessionModel.java b/server-spi/src/main/java/org/keycloak/sessions/CommonClientSessionModel.java index 90d083897b0..a536ef854c4 100644 --- a/server-spi/src/main/java/org/keycloak/sessions/CommonClientSessionModel.java +++ b/server-spi/src/main/java/org/keycloak/sessions/CommonClientSessionModel.java @@ -17,14 +17,15 @@ package org.keycloak.sessions; -import org.infinispan.protostream.annotations.Proto; -import org.infinispan.protostream.annotations.ProtoTypeId; +import java.util.Map; +import java.util.Objects; + import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.util.EnumWithStableIndex; -import java.util.Map; -import java.util.Objects; +import org.infinispan.protostream.annotations.Proto; +import org.infinispan.protostream.annotations.ProtoTypeId; /** * Predecessor of AuthenticationSessionModel, ClientLoginSessionModel and ClientSessionModel (then action tickets). Maybe we will remove it later... diff --git a/server-spi/src/main/java/org/keycloak/storage/StorageId.java b/server-spi/src/main/java/org/keycloak/storage/StorageId.java index eab722ce81a..1167c16ffaa 100644 --- a/server-spi/src/main/java/org/keycloak/storage/StorageId.java +++ b/server-spi/src/main/java/org/keycloak/storage/StorageId.java @@ -16,13 +16,13 @@ */ package org.keycloak.storage; +import java.io.Serializable; +import java.util.Objects; + import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.UserModel; -import java.io.Serializable; -import java.util.Objects; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/server-spi/src/main/java/org/keycloak/storage/client/ClientLookupProvider.java b/server-spi/src/main/java/org/keycloak/storage/client/ClientLookupProvider.java index 217cafa5472..56f8c916a0e 100644 --- a/server-spi/src/main/java/org/keycloak/storage/client/ClientLookupProvider.java +++ b/server-spi/src/main/java/org/keycloak/storage/client/ClientLookupProvider.java @@ -16,13 +16,13 @@ */ package org.keycloak.storage.client; +import java.util.Map; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.RealmModel; -import java.util.Map; -import java.util.stream.Stream; - /** * Abstraction interface for lookoup of clients by id and clientId. These methods required for participating in login flows. * diff --git a/server-spi/src/main/java/org/keycloak/storage/group/GroupLookupProvider.java b/server-spi/src/main/java/org/keycloak/storage/group/GroupLookupProvider.java index 2ec59e4431d..65f085a489c 100644 --- a/server-spi/src/main/java/org/keycloak/storage/group/GroupLookupProvider.java +++ b/server-spi/src/main/java/org/keycloak/storage/group/GroupLookupProvider.java @@ -16,12 +16,12 @@ */ package org.keycloak.storage.group; -import org.keycloak.models.GroupModel; -import org.keycloak.models.RealmModel; - import java.util.Map; import java.util.stream.Stream; +import org.keycloak.models.GroupModel; +import org.keycloak.models.RealmModel; + public interface GroupLookupProvider { /** diff --git a/server-spi/src/main/java/org/keycloak/storage/role/RoleLookupProvider.java b/server-spi/src/main/java/org/keycloak/storage/role/RoleLookupProvider.java index c65a295e0ac..a9c6dc28125 100644 --- a/server-spi/src/main/java/org/keycloak/storage/role/RoleLookupProvider.java +++ b/server-spi/src/main/java/org/keycloak/storage/role/RoleLookupProvider.java @@ -17,6 +17,7 @@ package org.keycloak.storage.role; import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; diff --git a/server-spi/src/main/java/org/keycloak/storage/role/RoleStorageProvider.java b/server-spi/src/main/java/org/keycloak/storage/role/RoleStorageProvider.java index 3521561cb74..a69957b1d13 100644 --- a/server-spi/src/main/java/org/keycloak/storage/role/RoleStorageProvider.java +++ b/server-spi/src/main/java/org/keycloak/storage/role/RoleStorageProvider.java @@ -24,4 +24,3 @@ import org.keycloak.provider.Provider; public interface RoleStorageProvider extends Provider, RoleLookupProvider { } - diff --git a/server-spi/src/main/java/org/keycloak/storage/user/UserCountMethodsProvider.java b/server-spi/src/main/java/org/keycloak/storage/user/UserCountMethodsProvider.java index dd93f7a642f..bbf8168bd5d 100644 --- a/server-spi/src/main/java/org/keycloak/storage/user/UserCountMethodsProvider.java +++ b/server-spi/src/main/java/org/keycloak/storage/user/UserCountMethodsProvider.java @@ -17,15 +17,15 @@ package org.keycloak.storage.user; -import org.keycloak.models.GroupModel; -import org.keycloak.models.RealmModel; -import org.keycloak.models.UserModel; - import java.util.Collections; import java.util.Map; import java.util.Set; import java.util.stream.Stream; +import org.keycloak.models.GroupModel; +import org.keycloak.models.RealmModel; +import org.keycloak.models.UserModel; + /** * This is an optional capability interface that is intended to be implemented by * UserStorageProvider that supports count queries. diff --git a/server-spi/src/main/java/org/keycloak/storage/user/UserQueryMethodsProvider.java b/server-spi/src/main/java/org/keycloak/storage/user/UserQueryMethodsProvider.java index 6fe2d555b5b..652f701a548 100644 --- a/server-spi/src/main/java/org/keycloak/storage/user/UserQueryMethodsProvider.java +++ b/server-spi/src/main/java/org/keycloak/storage/user/UserQueryMethodsProvider.java @@ -17,16 +17,16 @@ package org.keycloak.storage.user; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Stream; + import org.keycloak.models.GroupModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.utils.StringUtil; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Stream; - /** * This is an optional capability interface that is intended to be implemented by any * UserStorageProvider that supports complex user querying. You must diff --git a/server-spi/src/main/java/org/keycloak/theme/Theme.java b/server-spi/src/main/java/org/keycloak/theme/Theme.java index b3f5396102d..fd0c0e44149 100755 --- a/server-spi/src/main/java/org/keycloak/theme/Theme.java +++ b/server-spi/src/main/java/org/keycloak/theme/Theme.java @@ -17,14 +17,14 @@ package org.keycloak.theme; -import org.keycloak.models.RealmModel; - import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.Locale; import java.util.Properties; +import org.keycloak.models.RealmModel; + /** * @author Stian Thorgersen */ diff --git a/server-spi/src/main/java/org/keycloak/urls/HostnameProvider.java b/server-spi/src/main/java/org/keycloak/urls/HostnameProvider.java index 0b170cc816d..9e0b389cea6 100644 --- a/server-spi/src/main/java/org/keycloak/urls/HostnameProvider.java +++ b/server-spi/src/main/java/org/keycloak/urls/HostnameProvider.java @@ -18,11 +18,11 @@ package org.keycloak.urls; import java.net.URI; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.models.KeycloakContext; import org.keycloak.provider.Provider; -import jakarta.ws.rs.core.UriInfo; - /** * The Hostname provider is used by Keycloak to decide URLs for frontend and backend requests. A provider can either * base the URL on the request (Host header for example) or based on hard-coded URLs. Further, it is possible to have diff --git a/server-spi/src/main/java/org/keycloak/userprofile/Attributes.java b/server-spi/src/main/java/org/keycloak/userprofile/Attributes.java index cd63955a7ee..e62e01bdbb6 100644 --- a/server-spi/src/main/java/org/keycloak/userprofile/Attributes.java +++ b/server-spi/src/main/java/org/keycloak/userprofile/Attributes.java @@ -19,8 +19,6 @@ package org.keycloak.userprofile; -import static java.util.Optional.ofNullable; - import java.util.Collections; import java.util.List; import java.util.Map; @@ -30,6 +28,8 @@ import java.util.function.Function; import org.keycloak.validate.ValidationError; +import static java.util.Optional.ofNullable; + /** *

This interface wraps the attributes associated with a user profile. Different operations are provided to access and * manage these attributes. diff --git a/server-spi/src/main/java/org/keycloak/userprofile/UserProfileContext.java b/server-spi/src/main/java/org/keycloak/userprofile/UserProfileContext.java index b1344ee20d0..b67fa800da1 100644 --- a/server-spi/src/main/java/org/keycloak/userprofile/UserProfileContext.java +++ b/server-spi/src/main/java/org/keycloak/userprofile/UserProfileContext.java @@ -22,12 +22,12 @@ package org.keycloak.userprofile; import java.util.Set; import java.util.function.Predicate; -import static org.keycloak.userprofile.UserProfileConstants.ROLE_ADMIN; -import static org.keycloak.userprofile.UserProfileConstants.ROLE_USER; - import org.keycloak.models.UserModel; import org.keycloak.utils.StringUtil; +import static org.keycloak.userprofile.UserProfileConstants.ROLE_ADMIN; +import static org.keycloak.userprofile.UserProfileConstants.ROLE_USER; + /** *

This interface represents the different contexts from where user profiles are managed. The core contexts are already * available here representing the different areas in Keycloak where user profiles are managed. diff --git a/server-spi/src/main/java/org/keycloak/userprofile/UserProfileMetadata.java b/server-spi/src/main/java/org/keycloak/userprofile/UserProfileMetadata.java index 5744861538d..32afd58acda 100644 --- a/server-spi/src/main/java/org/keycloak/userprofile/UserProfileMetadata.java +++ b/server-spi/src/main/java/org/keycloak/userprofile/UserProfileMetadata.java @@ -19,8 +19,6 @@ package org.keycloak.userprofile; -import static org.keycloak.userprofile.AttributeMetadata.ALWAYS_TRUE; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -28,6 +26,8 @@ import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; +import static org.keycloak.userprofile.AttributeMetadata.ALWAYS_TRUE; + /** * @author Pedro Igor */ diff --git a/server-spi/src/main/java/org/keycloak/validate/ValidationError.java b/server-spi/src/main/java/org/keycloak/validate/ValidationError.java index 9d090cfe839..c4c4ceff2fa 100644 --- a/server-spi/src/main/java/org/keycloak/validate/ValidationError.java +++ b/server-spi/src/main/java/org/keycloak/validate/ValidationError.java @@ -16,12 +16,13 @@ */ package org.keycloak.validate; -import jakarta.ws.rs.core.Response; import java.io.Serializable; import java.util.Arrays; import java.util.Objects; import java.util.function.BiFunction; +import jakarta.ws.rs.core.Response; + /** * Denotes an error found during validation. */ diff --git a/server-spi/src/main/java/org/keycloak/validate/Validator.java b/server-spi/src/main/java/org/keycloak/validate/Validator.java index 41e3042605c..bf104bfdfac 100644 --- a/server-spi/src/main/java/org/keycloak/validate/Validator.java +++ b/server-spi/src/main/java/org/keycloak/validate/Validator.java @@ -18,10 +18,10 @@ */ package org.keycloak.validate; -import org.keycloak.provider.Provider; - import java.util.Map; +import org.keycloak.provider.Provider; + /** * Validates given input in a {@link ValidationContext}. *

diff --git a/server-spi/src/test/java/org/keycloak/models/OtpPolicyTest.java b/server-spi/src/test/java/org/keycloak/models/OtpPolicyTest.java index 25b2b80977e..5812167b704 100644 --- a/server-spi/src/test/java/org/keycloak/models/OtpPolicyTest.java +++ b/server-spi/src/test/java/org/keycloak/models/OtpPolicyTest.java @@ -1,12 +1,13 @@ package org.keycloak.models; +import java.net.URI; + +import org.keycloak.models.credential.OTPCredentialModel; +import org.keycloak.models.utils.HmacOTP; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.keycloak.models.credential.OTPCredentialModel; -import org.keycloak.models.utils.HmacOTP; - -import java.net.URI; public class OtpPolicyTest { diff --git a/server-spi/src/test/java/org/keycloak/models/credential/CredentialModelTest.java b/server-spi/src/test/java/org/keycloak/models/credential/CredentialModelTest.java index 1250abd24cc..4926cba9d56 100644 --- a/server-spi/src/test/java/org/keycloak/models/credential/CredentialModelTest.java +++ b/server-spi/src/test/java/org/keycloak/models/credential/CredentialModelTest.java @@ -1,16 +1,17 @@ package org.keycloak.models.credential; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; -import org.keycloak.credential.CredentialModel; -import org.keycloak.models.credential.dto.PasswordCredentialData; -import org.keycloak.models.credential.dto.PasswordSecretData; - import java.io.IOException; import java.util.Arrays; import java.util.Base64; import java.util.Collections; +import org.keycloak.credential.CredentialModel; +import org.keycloak.models.credential.dto.PasswordCredentialData; +import org.keycloak.models.credential.dto.PasswordSecretData; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.Test; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/server-spi/src/test/java/org/keycloak/models/credential/RecoveryCodesUnitTest.java b/server-spi/src/test/java/org/keycloak/models/credential/RecoveryCodesUnitTest.java index d742a3c9531..b33b0b28713 100644 --- a/server-spi/src/test/java/org/keycloak/models/credential/RecoveryCodesUnitTest.java +++ b/server-spi/src/test/java/org/keycloak/models/credential/RecoveryCodesUnitTest.java @@ -19,12 +19,13 @@ package org.keycloak.models.credential; +import org.keycloak.common.util.Time; +import org.keycloak.models.utils.RecoveryAuthnCodesUtils; + import org.jboss.logging.Logger; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; -import org.keycloak.common.util.Time; -import org.keycloak.models.utils.RecoveryAuthnCodesUtils; /** * @author Marek Posolda diff --git a/server-spi/src/test/java/org/keycloak/provider/ProviderConfigurationBuilderTest.java b/server-spi/src/test/java/org/keycloak/provider/ProviderConfigurationBuilderTest.java index af8ea5a901d..d2d30a0a32c 100644 --- a/server-spi/src/test/java/org/keycloak/provider/ProviderConfigurationBuilderTest.java +++ b/server-spi/src/test/java/org/keycloak/provider/ProviderConfigurationBuilderTest.java @@ -1,6 +1,7 @@ package org.keycloak.provider; import java.util.List; + import org.junit.Assert; import org.junit.Test; diff --git a/server-spi/src/test/java/org/keycloak/storage/StorageIdTest.java b/server-spi/src/test/java/org/keycloak/storage/StorageIdTest.java index c7c84c31a4c..5cadd03454f 100644 --- a/server-spi/src/test/java/org/keycloak/storage/StorageIdTest.java +++ b/server-spi/src/test/java/org/keycloak/storage/StorageIdTest.java @@ -17,7 +17,9 @@ package org.keycloak.storage; import org.keycloak.component.ComponentModel; + import org.junit.Test; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/server-spi/src/test/java/org/keycloak/utils/MapperTypeSerializerTest.java b/server-spi/src/test/java/org/keycloak/utils/MapperTypeSerializerTest.java index e216e4b960a..7700d8ef00e 100644 --- a/server-spi/src/test/java/org/keycloak/utils/MapperTypeSerializerTest.java +++ b/server-spi/src/test/java/org/keycloak/utils/MapperTypeSerializerTest.java @@ -22,12 +22,13 @@ package org.keycloak.utils; import java.util.List; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.MultivaluedMap; import org.keycloak.models.utils.MapperTypeSerializer; +import org.junit.Assert; +import org.junit.Test; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java b/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java index 4f356267b88..e7f816923f2 100755 --- a/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java +++ b/services/src/main/java/org/keycloak/authentication/AuthenticationProcessor.java @@ -17,19 +17,30 @@ package org.keycloak.authentication; +import java.io.IOException; +import java.net.URI; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import jakarta.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedMap; -import org.jboss.logging.Logger; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.OAuth2Constants; -import org.keycloak.authentication.authenticators.util.AcrStore; -import org.keycloak.http.HttpRequest; import org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator; import org.keycloak.authentication.authenticators.client.ClientAuthUtil; +import org.keycloak.authentication.authenticators.util.AcrStore; import org.keycloak.common.ClientConnection; import org.keycloak.common.util.Time; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; import org.keycloak.forms.login.LoginFormsProvider; +import org.keycloak.http.HttpRequest; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.AuthenticatorConfigModel; @@ -52,32 +63,22 @@ import org.keycloak.services.ErrorPage; import org.keycloak.services.ErrorPageException; import org.keycloak.services.ServicesLogger; import org.keycloak.services.managers.AuthenticationManager; +import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.services.managers.BruteForceProtector; import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.managers.UserSessionManager; -import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.services.messages.Messages; import org.keycloak.services.resources.LoginActionsService; -import org.keycloak.services.util.CacheControlUtil; import org.keycloak.services.util.AuthenticationFlowURLHelper; +import org.keycloak.services.util.CacheControlUtil; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; - -import jakarta.ws.rs.core.MultivaluedHashMap; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; import org.keycloak.utils.StringUtil; -import java.io.IOException; -import java.net.URI; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.jboss.logging.Logger; import static org.keycloak.models.light.LightweightUserAdapter.isLightweightUser; diff --git a/services/src/main/java/org/keycloak/authentication/AuthenticationSelectionResolver.java b/services/src/main/java/org/keycloak/authentication/AuthenticationSelectionResolver.java index 1c2ac58e011..42ce76b5b5b 100644 --- a/services/src/main/java/org/keycloak/authentication/AuthenticationSelectionResolver.java +++ b/services/src/main/java/org/keycloak/authentication/AuthenticationSelectionResolver.java @@ -25,12 +25,13 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.credential.CredentialModel; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.RealmModel; +import org.jboss.logging.Logger; + /** * Resolves set of AuthenticationSelectionOptions * diff --git a/services/src/main/java/org/keycloak/authentication/AuthenticatorUtil.java b/services/src/main/java/org/keycloak/authentication/AuthenticatorUtil.java index c001d45e5ad..e96a4ba2467 100755 --- a/services/src/main/java/org/keycloak/authentication/AuthenticatorUtil.java +++ b/services/src/main/java/org/keycloak/authentication/AuthenticatorUtil.java @@ -17,17 +17,27 @@ package org.keycloak.authentication; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.authentication.actiontoken.ActionTokenContext; import org.keycloak.authentication.actiontoken.DefaultActionToken; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; -import org.keycloak.events.Details; -import org.keycloak.events.EventBuilder; -import org.keycloak.events.EventType; import org.keycloak.common.util.reflections.Types; import org.keycloak.credential.CredentialProvider; import org.keycloak.credential.CredentialProviderFactory; +import org.keycloak.events.Details; +import org.keycloak.events.EventBuilder; +import org.keycloak.events.EventType; import org.keycloak.http.HttpRequest; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; @@ -41,20 +51,11 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; import static org.keycloak.services.managers.AuthenticationManager.FORCED_REAUTHENTICATION; -import static org.keycloak.services.managers.AuthenticationManager.SSO_AUTH; import static org.keycloak.services.managers.AuthenticationManager.PASSWORD_VALIDATED; +import static org.keycloak.services.managers.AuthenticationManager.SSO_AUTH; public class AuthenticatorUtil { diff --git a/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java b/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java index d0da6f06e54..ca6ef6bc3e8 100755 --- a/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java +++ b/services/src/main/java/org/keycloak/authentication/ClientAuthenticationFlow.java @@ -17,7 +17,14 @@ package org.keycloak.authentication; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Optional; + +import jakarta.ws.rs.core.Response; + import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.models.AuthenticationExecutionModel; @@ -26,12 +33,7 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.services.ServicesLogger; -import jakarta.ws.rs.core.Response; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Optional; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java b/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java index 43cc9132a4e..3b4d6efab15 100755 --- a/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java +++ b/services/src/main/java/org/keycloak/authentication/DefaultAuthenticationFlow.java @@ -17,7 +17,20 @@ package org.keycloak.authentication; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.authenticators.conditional.ConditionalAuthenticator; import org.keycloak.authentication.authenticators.util.AuthenticatorUtils; import org.keycloak.models.AuthenticationExecutionModel; @@ -29,19 +42,7 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.utils.StringUtil; -import jakarta.ws.rs.HttpMethod; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java b/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java index f026eb7dd66..ff14f9cf153 100755 --- a/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java +++ b/services/src/main/java/org/keycloak/authentication/FormAuthenticationFlow.java @@ -17,11 +17,25 @@ package org.keycloak.authentication; +import java.net.URI; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import org.keycloak.http.HttpRequest; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; import org.keycloak.forms.login.LoginFormsProvider; +import org.keycloak.http.HttpRequest; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticatorConfigModel; import org.keycloak.models.ClientModel; @@ -33,19 +47,6 @@ import org.keycloak.models.utils.FormMessage; import org.keycloak.services.resources.LoginActionsService; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; -import java.net.URI; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java b/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java index 0f4676ec816..d1170d433d2 100755 --- a/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java +++ b/services/src/main/java/org/keycloak/authentication/RequiredActionContextResult.java @@ -17,11 +17,16 @@ package org.keycloak.authentication; -import org.keycloak.http.HttpRequest; +import java.net.URI; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.ClientConnection; import org.keycloak.common.util.Time; import org.keycloak.events.EventBuilder; import org.keycloak.forms.login.LoginFormsProvider; +import org.keycloak.http.HttpRequest; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; @@ -32,10 +37,6 @@ import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.resources.LoginActionsService; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; -import java.net.URI; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenContext.java b/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenContext.java index 8f6073c66a8..0f299bd3499 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenContext.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenContext.java @@ -16,10 +16,15 @@ */ package org.keycloak.authentication.actiontoken; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; +import org.keycloak.http.HttpRequest; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -30,10 +35,6 @@ import org.keycloak.representations.JsonWebToken; import org.keycloak.services.Urls; import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilderException; -import jakarta.ws.rs.core.UriInfo; -import org.keycloak.http.HttpRequest; import org.keycloak.sessions.RootAuthenticationSessionModel; /** diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenHandler.java index 7e8804f90d4..9595d40c873 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/ActionTokenHandler.java @@ -16,6 +16,8 @@ */ package org.keycloak.authentication.actiontoken; +import jakarta.ws.rs.core.Response; + import org.keycloak.TokenVerifier.Predicate; import org.keycloak.common.VerificationException; import org.keycloak.events.EventBuilder; @@ -24,7 +26,6 @@ import org.keycloak.provider.Provider; import org.keycloak.representations.JsonWebToken; import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.Response; /** * Handler of the action token. diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/DefaultActionToken.java b/services/src/main/java/org/keycloak/authentication/actiontoken/DefaultActionToken.java index 3ebdd54a875..bda58f68bad 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/DefaultActionToken.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/DefaultActionToken.java @@ -17,21 +17,23 @@ package org.keycloak.authentication.actiontoken; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.TokenVerifier.Predicate; -import org.keycloak.common.VerificationException; -import org.keycloak.models.SingleUseObjectValueModel; -import org.keycloak.models.DefaultActionTokenKey; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.services.Urls; - -import jakarta.ws.rs.core.UriInfo; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import jakarta.ws.rs.core.UriInfo; + +import org.keycloak.TokenVerifier.Predicate; +import org.keycloak.common.VerificationException; +import org.keycloak.models.DefaultActionTokenKey; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.models.SingleUseObjectValueModel; +import org.keycloak.services.Urls; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Part of action token that is intended to be used e.g. in link sent in password-reset email. * The token encapsulates user, expected action and its time of expiry. diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/TokenUtils.java b/services/src/main/java/org/keycloak/authentication/actiontoken/TokenUtils.java index 71badbb04ed..84f0cc75dd6 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/TokenUtils.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/TokenUtils.java @@ -16,16 +16,16 @@ */ package org.keycloak.authentication.actiontoken; -import org.keycloak.TokenVerifier; -import org.keycloak.TokenVerifier.Predicate; -import org.keycloak.representations.JsonWebToken; - import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.function.BooleanSupplier; +import org.keycloak.TokenVerifier; +import org.keycloak.TokenVerifier.Predicate; +import org.keycloak.representations.JsonWebToken; + /** * * @author hmlnarik diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionToken.java b/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionToken.java index 7e73a55151f..a728f12ba81 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionToken.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionToken.java @@ -16,11 +16,13 @@ */ package org.keycloak.authentication.actiontoken.execactions; -import org.keycloak.authentication.actiontoken.DefaultActionToken; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.LinkedList; import java.util.List; +import org.keycloak.authentication.actiontoken.DefaultActionToken; + +import com.fasterxml.jackson.annotation.JsonProperty; + /** * * @author hmlnarik diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionTokenHandler.java index 217feda26b4..fc7cad0efc4 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/execactions/ExecuteActionsActionTokenHandler.java @@ -16,6 +16,12 @@ */ package org.keycloak.authentication.actiontoken.execactions; +import java.util.Objects; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.TokenVerifier; import org.keycloak.TokenVerifier.Predicate; import org.keycloak.authentication.AuthenticationProcessor; @@ -41,10 +47,6 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; -import java.util.Objects; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; import static org.keycloak.models.utils.DefaultRequiredActions.getDefaultRequiredActionCaseInsensitively; diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionToken.java b/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionToken.java index d81d21f2528..3b0eac828f9 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionToken.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionToken.java @@ -16,9 +16,10 @@ */ package org.keycloak.authentication.actiontoken.idpverifyemail; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.authentication.actiontoken.DefaultActionToken; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Representation of a token that represents a time-limited verify e-mail action. * diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionTokenHandler.java index c1fe04ca96b..5bcd9e32c10 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/idpverifyemail/IdpVerifyAccountLinkActionTokenHandler.java @@ -16,9 +16,15 @@ */ package org.keycloak.authentication.actiontoken.idpverifyemail; -import org.keycloak.authentication.actiontoken.AbstractActionTokenHandler; +import java.util.Map; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.TokenVerifier.Predicate; import org.keycloak.authentication.AuthenticationProcessor; +import org.keycloak.authentication.actiontoken.AbstractActionTokenHandler; import org.keycloak.authentication.actiontoken.ActionTokenContext; import org.keycloak.authentication.actiontoken.TokenUtils; import org.keycloak.authentication.authenticators.broker.IdpEmailVerificationAuthenticator; @@ -40,12 +46,6 @@ import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; - -import java.util.Map; - /** * Action token handler for verification of e-mail address. * @author hmlnarik diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionToken.java b/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionToken.java index 4e48cad06a3..4444fb37696 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionToken.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionToken.java @@ -16,9 +16,10 @@ */ package org.keycloak.authentication.actiontoken.inviteorg; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.authentication.actiontoken.DefaultActionToken; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Representation of a token that represents a time-limited verify e-mail action. * diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionTokenHandler.java index 0554aabae9e..ae8f81e2ee0 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/inviteorg/InviteOrgActionTokenHandler.java @@ -16,10 +16,14 @@ */ package org.keycloak.authentication.actiontoken.inviteorg; +import java.net.URI; +import java.util.Objects; + import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; + import org.keycloak.TokenVerifier.Predicate; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.authentication.actiontoken.AbstractActionTokenHandler; @@ -43,9 +47,6 @@ import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; -import java.net.URI; -import java.util.Objects; - /** * Action token handler for handling invitation of an existing user to an organization. A new user is handled in registration {@link org.keycloak.services.resources.LoginActionsService}. */ diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/resetcred/ResetCredentialsActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/resetcred/ResetCredentialsActionTokenHandler.java index 235dfc6217b..fd0af24cbb2 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/resetcred/ResetCredentialsActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/resetcred/ResetCredentialsActionTokenHandler.java @@ -16,6 +16,8 @@ */ package org.keycloak.authentication.actiontoken.resetcred; +import jakarta.ws.rs.core.Response; + import org.keycloak.TokenVerifier.Predicate; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.authentication.actiontoken.AbstractActionTokenHandler; @@ -30,7 +32,6 @@ import org.keycloak.services.messages.Messages; import org.keycloak.services.resources.LoginActionsService; import org.keycloak.services.resources.LoginActionsServiceChecks.IsActionRequired; import org.keycloak.sessions.CommonClientSessionModel.Action; -import jakarta.ws.rs.core.Response; import static org.keycloak.services.resources.LoginActionsService.RESET_CREDENTIALS_PATH; diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionToken.java b/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionToken.java index e019198248c..b98bc8f54c4 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionToken.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionToken.java @@ -17,9 +17,10 @@ package org.keycloak.authentication.actiontoken.updateemail; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.authentication.actiontoken.DefaultActionToken; +import com.fasterxml.jackson.annotation.JsonProperty; + public class UpdateEmailActionToken extends DefaultActionToken { public static final String TOKEN_TYPE = "update-email"; diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionTokenHandler.java index 1a15264bdfd..9d456a5e60c 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/updateemail/UpdateEmailActionTokenHandler.java @@ -19,7 +19,9 @@ package org.keycloak.authentication.actiontoken.updateemail; import java.util.List; import java.util.Objects; + import jakarta.ws.rs.core.Response; + import org.keycloak.TokenVerifier; import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.authentication.actiontoken.AbstractActionTokenHandler; diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionToken.java b/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionToken.java index f4226e2c26d..8ff56dd1a8d 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionToken.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionToken.java @@ -16,9 +16,10 @@ */ package org.keycloak.authentication.actiontoken.verifyemail; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.authentication.actiontoken.DefaultActionToken; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Representation of a token that represents a time-limited verify e-mail action. * diff --git a/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionTokenHandler.java b/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionTokenHandler.java index 098781b5851..c4356c5bc32 100644 --- a/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionTokenHandler.java +++ b/services/src/main/java/org/keycloak/authentication/actiontoken/verifyemail/VerifyEmailActionTokenHandler.java @@ -16,9 +16,16 @@ */ package org.keycloak.authentication.actiontoken.verifyemail; +import java.util.Objects; +import java.util.stream.Stream; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; + +import org.keycloak.TokenVerifier.Predicate; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.authentication.actiontoken.AbstractActionTokenHandler; -import org.keycloak.TokenVerifier.Predicate; import org.keycloak.authentication.actiontoken.ActionTokenContext; import org.keycloak.authentication.actiontoken.TokenUtils; import org.keycloak.events.Details; @@ -39,12 +46,6 @@ import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; -import java.util.Objects; -import java.util.stream.Stream; - -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; /** * Action token handler for verification of e-mail address. diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/access/AllowAccessAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/access/AllowAccessAuthenticator.java index 9f37c40615c..5771deda67b 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/access/AllowAccessAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/access/AllowAccessAuthenticator.java @@ -17,13 +17,14 @@ package org.keycloak.authentication.authenticators.access; -import org.jboss.logging.Logger; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import org.jboss.logging.Logger; + /** * Authenticator will always successfully authenticate. * Useful for example in the conditional flows to be used after satisfying the previous conditions. diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/access/AllowAccessAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/access/AllowAccessAuthenticatorFactory.java index 2c237995c6d..3e752f44e4b 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/access/AllowAccessAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/access/AllowAccessAuthenticatorFactory.java @@ -17,6 +17,8 @@ package org.keycloak.authentication.authenticators.access; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -25,8 +27,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Martin Bartos */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticator.java index 3f111d87cd3..367add499d3 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticator.java @@ -17,6 +17,10 @@ package org.keycloak.authentication.authenticators.access; +import java.util.Optional; + +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.Authenticator; @@ -27,9 +31,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.services.messages.Messages; -import jakarta.ws.rs.core.Response; -import java.util.Optional; - /** * Explicitly deny access to the resources. * Useful for example in the conditional flows to be used after satisfying the previous conditions. after satisfying conditions in the conditional flow. diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticatorFactory.java index 262d494de14..f99536bce94 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/access/DenyAccessAuthenticatorFactory.java @@ -17,6 +17,9 @@ package org.keycloak.authentication.authenticators.access; +import java.util.Collections; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -25,9 +28,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.List; - /** * @author Martin Bartos */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/AbstractIdpAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/AbstractIdpAuthenticator.java index d5b5c2937fb..be8f6b3b7dd 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/AbstractIdpAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/AbstractIdpAuthenticator.java @@ -17,6 +17,8 @@ package org.keycloak.authentication.authenticators.broker; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.AuthenticationFlowException; @@ -31,8 +33,6 @@ import org.keycloak.models.UserModel; import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.Response; - /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpAutoLinkAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpAutoLinkAuthenticator.java index 36b68c34940..aa31a8f5610 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpAutoLinkAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpAutoLinkAuthenticator.java @@ -17,9 +17,7 @@ package org.keycloak.authentication.authenticators.broker; -import org.jboss.logging.Logger; import org.keycloak.authentication.AuthenticationFlowContext; -import static org.keycloak.authentication.authenticators.broker.AbstractIdpAuthenticator.getExistingUser; import org.keycloak.authentication.authenticators.broker.util.SerializedBrokeredIdentityContext; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.models.KeycloakSession; @@ -27,6 +25,10 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.sessions.AuthenticationSessionModel; +import org.jboss.logging.Logger; + +import static org.keycloak.authentication.authenticators.broker.AbstractIdpAuthenticator.getExistingUser; + /** * @author Ryan Slominski */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpAutoLinkAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpAutoLinkAuthenticatorFactory.java index 4338af99dfc..a19ffed97d2 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpAutoLinkAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpAutoLinkAuthenticatorFactory.java @@ -18,6 +18,7 @@ package org.keycloak.authentication.authenticators.broker; import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticator.java index 57b3c1808f7..11fb6c0c6aa 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticator.java @@ -17,6 +17,9 @@ package org.keycloak.authentication.authenticators.broker; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.AuthenticationFlowException; @@ -32,9 +35,6 @@ import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.CommonClientSessionModel; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticatorFactory.java index 9925e8357a6..0ab49691ba7 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmLinkAuthenticatorFactory.java @@ -17,6 +17,8 @@ package org.keycloak.authentication.authenticators.broker; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -25,8 +27,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmOverrideLinkAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmOverrideLinkAuthenticator.java index a3f114a3c6b..ecf92ecae19 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmOverrideLinkAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmOverrideLinkAuthenticator.java @@ -19,6 +19,7 @@ package org.keycloak.authentication.authenticators.broker; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.AuthenticationFlowException; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmOverrideLinkAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmOverrideLinkAuthenticatorFactory.java index fe103bed280..dcb7561af97 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmOverrideLinkAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpConfirmOverrideLinkAuthenticatorFactory.java @@ -17,6 +17,9 @@ package org.keycloak.authentication.authenticators.broker; +import java.util.Collections; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -25,9 +28,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.List; - public class IdpConfirmOverrideLinkAuthenticatorFactory implements AuthenticatorFactory { public static final String PROVIDER_ID = "idp-confirm-override-link"; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticator.java index b011579f181..da11d5c7d64 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticator.java @@ -17,7 +17,11 @@ package org.keycloak.authentication.authenticators.broker; -import org.jboss.logging.Logger; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.authenticators.broker.util.ExistingUserInfo; import org.keycloak.authentication.authenticators.broker.util.SerializedBrokeredIdentityContext; @@ -33,9 +37,7 @@ import org.keycloak.models.light.LightweightUserAdapter; import org.keycloak.services.ServicesLogger; import org.keycloak.services.messages.Messages; -import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; import static org.keycloak.authentication.actiontoken.idpverifyemail.IdpVerifyAccountLinkActionTokenHandler.runIfUserVerified; import static org.keycloak.broker.provider.AbstractIdentityProvider.BROKER_REGISTERED_NEW_USER; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticatorFactory.java index adf7060a295..f129911dacf 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpCreateUserIfUniqueAuthenticatorFactory.java @@ -17,6 +17,9 @@ package org.keycloak.authentication.authenticators.broker; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -25,9 +28,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.List; - /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticator.java index 0db06154a94..8ba6b74cbef 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticator.java @@ -17,7 +17,8 @@ package org.keycloak.authentication.authenticators.broker; -import org.jboss.logging.Logger; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.authenticators.broker.util.ExistingUserInfo; import org.keycloak.authentication.authenticators.broker.util.SerializedBrokeredIdentityContext; @@ -30,7 +31,7 @@ import org.keycloak.models.UserModel; import org.keycloak.services.ServicesLogger; import org.keycloak.services.messages.Messages; -import jakarta.ws.rs.core.Response; +import org.jboss.logging.Logger; public class IdpDetectExistingBrokerUserAuthenticator extends IdpCreateUserIfUniqueAuthenticator { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticatorFactory.java index e08af92c740..4aef74fd6f2 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpDetectExistingBrokerUserAuthenticatorFactory.java @@ -17,6 +17,9 @@ package org.keycloak.authentication.authenticators.broker; +import java.util.Collections; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -25,9 +28,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.List; - public class IdpDetectExistingBrokerUserAuthenticatorFactory implements AuthenticatorFactory { public static final String PROVIDER_ID = "idp-detect-existing-broker-user"; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticator.java index c2203ae016c..a0a18fb1f64 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticator.java @@ -17,7 +17,15 @@ package org.keycloak.authentication.authenticators.broker; -import org.jboss.logging.Logger; +import java.net.URI; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.AuthenticationProcessor; @@ -43,13 +51,7 @@ import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; -import java.net.URI; -import java.util.Objects; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import java.util.concurrent.TimeUnit; -import jakarta.ws.rs.core.UriBuilderException; -import jakarta.ws.rs.core.UriInfo; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticatorFactory.java index 8fcbcf4249f..54c28f6eb0e 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpEmailVerificationAuthenticatorFactory.java @@ -17,6 +17,8 @@ package org.keycloak.authentication.authenticators.broker; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -25,8 +27,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticator.java index fac7561ce26..808261eab94 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticator.java @@ -17,7 +17,15 @@ package org.keycloak.authentication.authenticators.broker; -import org.jboss.logging.Logger; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.authenticators.broker.util.SerializedBrokeredIdentityContext; import org.keycloak.broker.provider.AbstractIdentityProvider; @@ -35,19 +43,12 @@ import org.keycloak.models.utils.FormMessage; import org.keycloak.models.utils.UserModelDelegate; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.services.validation.Validation; -import org.keycloak.userprofile.UserProfileContext; -import org.keycloak.userprofile.ValidationException; import org.keycloak.userprofile.UserProfile; +import org.keycloak.userprofile.UserProfileContext; import org.keycloak.userprofile.UserProfileProvider; +import org.keycloak.userprofile.ValidationException; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticatorFactory.java index 398e514e54a..a3864ead1c5 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpReviewProfileAuthenticatorFactory.java @@ -17,6 +17,10 @@ package org.keycloak.authentication.authenticators.broker; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -26,10 +30,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpUsernamePasswordForm.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpUsernamePasswordForm.java index 0bf648e00cf..356511bdc2f 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpUsernamePasswordForm.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/IdpUsernamePasswordForm.java @@ -17,8 +17,12 @@ package org.keycloak.authentication.authenticators.broker; +import java.util.Optional; + import jakarta.ws.rs.core.MultivaluedHashMap; -import org.jboss.logging.Logger; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.AuthenticationFlowException; @@ -34,10 +38,7 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; -import java.util.Optional; - -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; +import org.jboss.logging.Logger; /** * Same like classic username+password form, but for use in IdP linking. diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/ExistingUserInfo.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/ExistingUserInfo.java index 2054441d52f..883f2a297a0 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/ExistingUserInfo.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/ExistingUserInfo.java @@ -17,10 +17,10 @@ package org.keycloak.authentication.authenticators.broker.util; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; +import org.keycloak.util.JsonSerialization; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/SerializedBrokeredIdentityContext.java b/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/SerializedBrokeredIdentityContext.java index d6e88154698..d923bbc6f09 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/SerializedBrokeredIdentityContext.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/broker/util/SerializedBrokeredIdentityContext.java @@ -17,7 +17,14 @@ package org.keycloak.authentication.authenticators.broker.util; -import com.fasterxml.jackson.annotation.JsonIgnore; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.authentication.requiredactions.util.UpdateProfileContext; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.IdentityProviderDataMarshaller; @@ -35,13 +42,7 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.userprofile.UserProfileContext; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import com.fasterxml.jackson.annotation.JsonIgnore; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java index d458a8ef47f..447f4d27113 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/AbstractUsernameFormAuthenticator.java @@ -17,6 +17,9 @@ package org.keycloak.authentication.authenticators.browser; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AbstractFormAuthenticator; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; @@ -33,9 +36,6 @@ import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.services.ServicesLogger; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.messages.Messages; - -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; import org.keycloak.sessions.AuthenticationSessionModel; import static org.keycloak.authentication.authenticators.util.AuthenticatorUtils.getDisabledByBruteForceEventError; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticator.java index 91fd8af74cd..73d40bf1918 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticator.java @@ -17,16 +17,6 @@ package org.keycloak.authentication.authenticators.browser; -import org.keycloak.authentication.AuthenticationFlowContext; -import org.keycloak.models.AuthenticatorConfigModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.models.RoleModel; -import org.keycloak.models.UserModel; - -import jakarta.ws.rs.core.MultivaluedMap; -import org.keycloak.sessions.AuthenticationSessionModel; - import java.util.Collections; import java.util.List; import java.util.Map; @@ -34,6 +24,16 @@ import java.util.Optional; import java.util.regex.Pattern; import java.util.stream.Collectors; +import jakarta.ws.rs.core.MultivaluedMap; + +import org.keycloak.authentication.AuthenticationFlowContext; +import org.keycloak.models.AuthenticatorConfigModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.models.RoleModel; +import org.keycloak.models.UserModel; +import org.keycloak.sessions.AuthenticationSessionModel; + import static org.keycloak.authentication.authenticators.browser.ConditionalOtpFormAuthenticator.OtpDecision.ABSTAIN; import static org.keycloak.authentication.authenticators.browser.ConditionalOtpFormAuthenticator.OtpDecision.SHOW_OTP; import static org.keycloak.authentication.authenticators.browser.ConditionalOtpFormAuthenticator.OtpDecision.SKIP_OTP; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticatorFactory.java index 1cc8606049e..0ff23c08cd1 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticatorFactory.java @@ -17,6 +17,8 @@ package org.keycloak.authentication.authenticators.browser; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -26,9 +28,8 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - import static java.util.Arrays.asList; + import static org.keycloak.authentication.authenticators.browser.ConditionalOtpFormAuthenticator.DEFAULT_OTP_OUTCOME; import static org.keycloak.authentication.authenticators.browser.ConditionalOtpFormAuthenticator.FORCE; import static org.keycloak.authentication.authenticators.browser.ConditionalOtpFormAuthenticator.FORCE_OTP_FOR_HTTP_HEADER; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/CookieAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/CookieAuthenticatorFactory.java index ba18295e6ab..b90130597d7 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/CookieAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/CookieAuthenticatorFactory.java @@ -17,6 +17,8 @@ package org.keycloak.authentication.authenticators.browser; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -25,8 +27,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticator.java index fdf7d773234..14a8f616515 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticator.java @@ -17,7 +17,10 @@ package org.keycloak.authentication.authenticators.browser; -import org.jboss.logging.Logger; +import java.net.URI; + +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.authentication.Authenticator; @@ -30,8 +33,7 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.services.Urls; import org.keycloak.services.managers.ClientSessionCode; -import jakarta.ws.rs.core.Response; -import java.net.URI; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticatorFactory.java index 9d173f21783..6895bb49c4e 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/IdentityProviderAuthenticatorFactory.java @@ -17,6 +17,9 @@ package org.keycloak.authentication.authenticators.browser; +import java.util.Collections; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -25,9 +28,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.List; - import static org.keycloak.provider.ProviderConfigProperty.STRING_TYPE; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java index aca527d1000..7c9786f4608 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticator.java @@ -17,6 +17,12 @@ package org.keycloak.authentication.authenticators.browser; +import java.util.Collections; +import java.util.List; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.Authenticator; @@ -39,11 +45,6 @@ import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.util.Collections; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticatorFactory.java index f308106b24f..5fe5306128f 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/OTPFormAuthenticatorFactory.java @@ -17,6 +17,8 @@ package org.keycloak.authentication.authenticators.browser; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -26,8 +28,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasskeysConditionalUIAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasskeysConditionalUIAuthenticator.java index 0908c184501..0a74a944461 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasskeysConditionalUIAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasskeysConditionalUIAuthenticator.java @@ -21,11 +21,11 @@ */ package org.keycloak.authentication.authenticators.browser; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.models.KeycloakSession; -import jakarta.ws.rs.core.Response; - @Deprecated(since = "26.3", forRemoval = true) public class PasskeysConditionalUIAuthenticator extends WebAuthnPasswordlessAuthenticator { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordForm.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordForm.java index 232ae014a25..11cd84fe30e 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordForm.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordForm.java @@ -17,6 +17,9 @@ package org.keycloak.authentication.authenticators.browser; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.CredentialValidator; import org.keycloak.credential.CredentialProvider; @@ -27,9 +30,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.services.messages.Messages; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - public class PasswordForm extends UsernamePasswordForm implements CredentialValidator { public PasswordForm(KeycloakSession session) { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordFormFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordFormFactory.java index fbd1fbf193a..67b32d68943 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordFormFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/PasswordFormFactory.java @@ -17,6 +17,8 @@ package org.keycloak.authentication.authenticators.browser; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -26,8 +28,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.credential.PasswordCredentialModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticator.java index 088c828e56c..eb010c131f1 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticator.java @@ -1,5 +1,10 @@ package org.keycloak.authentication.authenticators.browser; +import java.util.Optional; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.Authenticator; @@ -18,16 +23,12 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; import org.keycloak.models.credential.RecoveryAuthnCodesCredentialModel; -import org.keycloak.models.utils.RecoveryAuthnCodesUtils; import org.keycloak.models.utils.FormMessage; +import org.keycloak.models.utils.RecoveryAuthnCodesUtils; import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.storage.ReadOnlyException; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.util.Optional; - import static org.keycloak.services.validation.Validation.FIELD_USERNAME; public class RecoveryAuthnCodesFormAuthenticator implements Authenticator, CredentialValidator { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticatorFactory.java index 573a6eaeb55..0c0fe64b2e0 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/RecoveryAuthnCodesFormAuthenticatorFactory.java @@ -1,5 +1,7 @@ package org.keycloak.authentication.authenticators.browser; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -12,8 +14,6 @@ import org.keycloak.models.credential.RecoveryAuthnCodesCredentialModel; import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - public class RecoveryAuthnCodesFormAuthenticatorFactory implements AuthenticatorFactory, EnvironmentDependentProviderFactory { public static final String PROVIDER_ID = "auth-recovery-authn-code-form"; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/ScriptBasedAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/ScriptBasedAuthenticator.java index 7f7e442477c..1105a3d63c4 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/ScriptBasedAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/ScriptBasedAuthenticator.java @@ -16,7 +16,8 @@ */ package org.keycloak.authentication.authenticators.browser; -import org.jboss.logging.Logger; +import java.util.Map; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.Authenticator; @@ -29,7 +30,7 @@ import org.keycloak.scripting.InvocableScriptAdapter; import org.keycloak.scripting.ScriptExecutionException; import org.keycloak.scripting.ScriptingProvider; -import java.util.Map; +import org.jboss.logging.Logger; /** * An {@link Authenticator} that can execute a configured script during authentication flow. diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/ScriptBasedAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/ScriptBasedAuthenticatorFactory.java index fec9f9b5a31..1483ccc09aa 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/ScriptBasedAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/ScriptBasedAuthenticatorFactory.java @@ -16,6 +16,8 @@ */ package org.keycloak.authentication.authenticators.browser; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -26,9 +28,8 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - import static java.util.Arrays.asList; + import static org.keycloak.authentication.authenticators.browser.ScriptBasedAuthenticator.SCRIPT_CODE; import static org.keycloak.authentication.authenticators.browser.ScriptBasedAuthenticator.SCRIPT_DESCRIPTION; import static org.keycloak.authentication.authenticators.browser.ScriptBasedAuthenticator.SCRIPT_NAME; 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 e5492ca53c2..6d21b3b992a 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 @@ -17,8 +17,13 @@ package org.keycloak.authentication.authenticators.browser; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; +import java.net.URI; +import java.util.Map; + +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.AuthenticationProcessor; @@ -26,6 +31,7 @@ import org.keycloak.authentication.Authenticator; import org.keycloak.common.constants.KerberosConstants; import org.keycloak.events.Errors; import org.keycloak.forms.login.LoginFormsProvider; +import org.keycloak.http.HttpRequest; import org.keycloak.models.CredentialValidationOutput; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -33,11 +39,7 @@ import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; import org.keycloak.services.messages.Messages; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticatorFactory.java index 73ffbb533ef..7455a235bd5 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/SpnegoAuthenticatorFactory.java @@ -17,6 +17,8 @@ package org.keycloak.authentication.authenticators.browser; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; @@ -28,8 +30,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.UserCredentialModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameForm.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameForm.java index b8fc0eafd68..d2cd514dc01 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameForm.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameForm.java @@ -19,6 +19,9 @@ package org.keycloak.authentication.authenticators.browser; import java.util.Objects; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.authenticators.broker.AbstractIdpAuthenticator; import org.keycloak.authentication.authenticators.broker.util.SerializedBrokeredIdentityContext; @@ -27,9 +30,6 @@ import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; import org.keycloak.services.messages.Messages; - -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; import org.keycloak.sessions.AuthenticationSessionModel; public final class UsernameForm extends UsernamePasswordForm { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameFormFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameFormFactory.java index a6894bc25ab..7d74bd190c7 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameFormFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernameFormFactory.java @@ -18,7 +18,9 @@ package org.keycloak.authentication.authenticators.browser; import java.util.Collections; +import java.util.List; import java.util.Set; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -29,8 +31,6 @@ import org.keycloak.models.credential.PasswordCredentialModel; import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java index 15021167e6c..7b37c059f93 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordForm.java @@ -17,22 +17,22 @@ package org.keycloak.authentication.authenticators.browser; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.WebAuthnConstants; import org.keycloak.authentication.AuthenticationFlowContext; -import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.authentication.Authenticator; +import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.credential.PasswordCredentialModel; -import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.services.managers.AuthenticationManager; - -import jakarta.ws.rs.core.MultivaluedHashMap; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; +import org.keycloak.sessions.AuthenticationSessionModel; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordFormFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordFormFactory.java index 7a91c1f0ff8..efa4e8e99f3 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordFormFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/UsernamePasswordFormFactory.java @@ -18,6 +18,9 @@ package org.keycloak.authentication.authenticators.browser; import java.util.Collections; +import java.util.List; +import java.util.Set; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -28,9 +31,6 @@ import org.keycloak.models.credential.PasswordCredentialModel; import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java index eb5a3024548..459a5ca1d86 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java @@ -16,14 +16,12 @@ package org.keycloak.authentication.authenticators.browser; -import com.webauthn4j.data.AuthenticationRequest; -import com.webauthn4j.data.client.Origin; -import com.webauthn4j.data.client.challenge.Challenge; -import com.webauthn4j.data.client.challenge.DefaultChallenge; -import com.webauthn4j.server.ServerProperty; -import com.webauthn4j.util.exception.WebAuthnException; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.List; -import org.jboss.logging.Logger; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.keycloak.WebAuthnConstants; import org.keycloak.authentication.AuthenticationFlowContext; @@ -52,11 +50,13 @@ import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.utils.StringUtil; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.List; +import com.webauthn4j.data.AuthenticationRequest; +import com.webauthn4j.data.client.Origin; +import com.webauthn4j.data.client.challenge.Challenge; +import com.webauthn4j.data.client.challenge.DefaultChallenge; +import com.webauthn4j.server.ServerProperty; +import com.webauthn4j.util.exception.WebAuthnException; +import org.jboss.logging.Logger; import static org.keycloak.WebAuthnConstants.AUTH_ERR_DETAIL_LABEL; import static org.keycloak.WebAuthnConstants.AUTH_ERR_LABEL; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticatorFactory.java index ee669b2cfe7..88149e70813 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticatorFactory.java @@ -16,6 +16,8 @@ package org.keycloak.authentication.authenticators.browser; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -27,8 +29,6 @@ import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - public class WebAuthnAuthenticatorFactory implements AuthenticatorFactory, EnvironmentDependentProviderFactory { public static final String PROVIDER_ID = "webauthn-authenticator"; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnConditionalUIAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnConditionalUIAuthenticator.java index c633d0f50bd..b58d49941cf 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnConditionalUIAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnConditionalUIAuthenticator.java @@ -16,8 +16,10 @@ */ package org.keycloak.authentication.authenticators.browser; -import jakarta.ws.rs.core.Response; import java.util.function.Function; + +import jakarta.ws.rs.core.Response; + import org.keycloak.WebAuthnConstants; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.authenticators.util.AuthenticatorUtils; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataService.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataService.java index aba3210f8f0..9f92372a256 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataService.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataService.java @@ -5,10 +5,11 @@ import java.io.InputStream; import java.util.Map; import java.util.stream.Collectors; -import com.fasterxml.jackson.core.type.TypeReference; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.FileUtils; +import com.fasterxml.jackson.core.type.TypeReference; + /** * Provides metadata for WebAuthn credentials * diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnPasswordlessAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnPasswordlessAuthenticator.java index 615e944ac57..644e99d3276 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnPasswordlessAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnPasswordlessAuthenticator.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.List; import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.WebAuthnConstants; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.RequiredActionFactory; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractBaseJWTValidator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractBaseJWTValidator.java index 7633172c8f3..a17ded4004d 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractBaseJWTValidator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractBaseJWTValidator.java @@ -19,13 +19,15 @@ package org.keycloak.authentication.authenticators.client; import java.util.List; -import org.jboss.logging.Logger; + import org.keycloak.common.util.Time; import org.keycloak.jose.jws.JWSInput; import org.keycloak.models.KeycloakSession; import org.keycloak.models.SingleUseObjectProvider; import org.keycloak.representations.JsonWebToken; +import org.jboss.logging.Logger; + /** * Base validator for JWT authorization grant and JWT client validators. * diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractJWTClientValidator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractJWTClientValidator.java index 15c43642b1a..c3bda51276d 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractJWTClientValidator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/AbstractJWTClientValidator.java @@ -19,9 +19,10 @@ package org.keycloak.authentication.authenticators.client; -import jakarta.ws.rs.core.Response; import java.util.List; -import org.jboss.logging.Logger; + +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.ClientAuthenticationFlowContext; @@ -29,6 +30,8 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.representations.JsonWebToken; +import org.jboss.logging.Logger; + /** * Common validation for JWT client authentication with private_key_jwt or with client_secret * diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAssertionState.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAssertionState.java index f878b811e21..f9c1840be6c 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAssertionState.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAssertionState.java @@ -1,6 +1,7 @@ package org.keycloak.authentication.authenticators.client; import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.ClientAuthenticationFlowContext; import org.keycloak.authentication.ClientAuthenticationFlowContextSupplier; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java index 3aa6d5aa7f4..35cc643e44f 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientAuthUtil.java @@ -17,11 +17,11 @@ package org.keycloak.authentication.authenticators.client; -import org.keycloak.representations.idm.OAuth2ErrorRepresentation; - import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; +import org.keycloak.representations.idm.OAuth2ErrorRepresentation; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientIdAndSecretAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientIdAndSecretAuthenticator.java index 98c0cc60be0..f090e81f100 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientIdAndSecretAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/ClientIdAndSecretAuthenticator.java @@ -17,6 +17,19 @@ package org.keycloak.authentication.authenticators.client; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.ClientAuthenticationFlowContext; @@ -28,18 +41,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.util.BasicAuthHelper; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * Validates client based on "client_id" and "client_secret" sent either in request parameters or in "Authorization: Basic" header . * diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/FederatedJWTClientAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/FederatedJWTClientAuthenticator.java index c35ad1a0061..11562eb96db 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/FederatedJWTClientAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/FederatedJWTClientAuthenticator.java @@ -1,6 +1,10 @@ package org.keycloak.authentication.authenticators.client; -import org.jboss.logging.Logger; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.keycloak.Config; import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationFlowError; @@ -19,10 +23,7 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.services.resources.IdentityBrokerService; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.jboss.logging.Logger; public class FederatedJWTClientAuthenticator extends AbstractClientAuthenticator implements EnvironmentDependentProviderFactory { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/FederatedJWTClientValidator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/FederatedJWTClientValidator.java index 7dfefdfb31c..f0b897faa6b 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/FederatedJWTClientValidator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/FederatedJWTClientValidator.java @@ -1,11 +1,11 @@ package org.keycloak.authentication.authenticators.client; -import org.keycloak.authentication.ClientAuthenticationFlowContext; -import org.keycloak.services.Urls; - import java.util.Collections; import java.util.List; +import org.keycloak.authentication.ClientAuthenticationFlowContext; +import org.keycloak.services.Urls; + public class FederatedJWTClientValidator extends AbstractJWTClientValidator { private final String expectedTokenIssuer; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java index 4321a14112c..9eeadd2ffcd 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientAuthenticator.java @@ -18,7 +18,17 @@ package org.keycloak.authentication.authenticators.client; +import java.security.PublicKey; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import jakarta.ws.rs.core.Response; + import org.keycloak.OAuthErrorException; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.ClientAuthenticationFlowContext; @@ -33,15 +43,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.JsonWebToken; import org.keycloak.services.ServicesLogger; -import java.security.PublicKey; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import static org.keycloak.models.TokenManager.DEFAULT_VALIDATOR; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientSecretAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientSecretAuthenticator.java index 7884bd76700..f11fec8baef 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientSecretAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientSecretAuthenticator.java @@ -16,7 +16,16 @@ */ package org.keycloak.authentication.authenticators.client; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.ClientAuthenticationFlowContext; import org.keycloak.crypto.ClientSignatureVerifierProvider; @@ -29,14 +38,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.JsonWebToken; import org.keycloak.services.ServicesLogger; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - import static org.keycloak.models.TokenManager.DEFAULT_VALIDATOR; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientValidator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientValidator.java index 1af04a0b753..7ec21712d9c 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientValidator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/JWTClientValidator.java @@ -1,5 +1,9 @@ package org.keycloak.authentication.authenticators.client; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import org.keycloak.authentication.ClientAuthenticationFlowContext; import org.keycloak.protocol.LoginProtocol; import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; @@ -10,10 +14,6 @@ import org.keycloak.protocol.oidc.grants.ciba.CibaGrantType; import org.keycloak.protocol.oidc.par.endpoints.ParEndpoint; import org.keycloak.services.Urls; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public class JWTClientValidator extends AbstractJWTClientValidator { public JWTClientValidator(ClientAuthenticationFlowContext context, SignatureValidator signatureValidator, String clientAuthenticatorProviderId) throws Exception { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/client/X509ClientAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/client/X509ClientAuthenticator.java index bec2495a3a4..205c76e8c6b 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/client/X509ClientAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/client/X509ClientAuthenticator.java @@ -1,20 +1,5 @@ package org.keycloak.authentication.authenticators.client; -import org.jboss.logging.Logger; -import org.keycloak.OAuth2Constants; -import org.keycloak.authentication.AuthenticationFlowError; -import org.keycloak.authentication.ClientAuthenticationFlowContext; -import org.keycloak.models.AuthenticationExecutionModel; -import org.keycloak.models.ClientModel; -import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.services.x509.X509ClientCertificateLookup; - -import javax.security.auth.x500.X500Principal; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; import java.security.GeneralSecurityException; import java.security.cert.X509Certificate; import java.util.Arrays; @@ -26,6 +11,23 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Collectors; +import javax.security.auth.x500.X500Principal; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + +import org.keycloak.OAuth2Constants; +import org.keycloak.authentication.AuthenticationFlowError; +import org.keycloak.authentication.ClientAuthenticationFlowContext; +import org.keycloak.models.AuthenticationExecutionModel; +import org.keycloak.models.ClientModel; +import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; +import org.keycloak.protocol.oidc.OIDCLoginProtocol; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.services.x509.X509ClientCertificateLookup; + +import org.jboss.logging.Logger; public class X509ClientAuthenticator extends AbstractClientAuthenticator { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalAuthenticator.java index 11c1cb02313..67dc4970070 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalAuthenticator.java @@ -17,11 +17,11 @@ package org.keycloak.authentication.authenticators.conditional; +import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import org.keycloak.authentication.AuthenticationFlowContext; public interface ConditionalAuthenticator extends Authenticator { boolean matchCondition(AuthenticationFlowContext context); diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalClientScopeAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalClientScopeAuthenticator.java index a6b2697238a..3622f93d67f 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalClientScopeAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalClientScopeAuthenticator.java @@ -19,7 +19,6 @@ package org.keycloak.authentication.authenticators.conditional; -import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.models.AuthenticatorConfigModel; @@ -31,6 +30,8 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.oidc.TokenManager; import org.keycloak.sessions.AuthenticationSessionModel; +import org.jboss.logging.Logger; + /** * Conditional authenticator to check if specified client-scope is present in the authentication request * diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalCredentialAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalCredentialAuthenticator.java index 0ffb151d87f..274c92b5441 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalCredentialAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalCredentialAuthenticator.java @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import org.jboss.logging.Logger; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.models.Constants; @@ -30,6 +30,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import org.jboss.logging.Logger; + /** * @author rmartinc */ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalCredentialAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalCredentialAuthenticatorFactory.java index 9d26e71f03f..4f9b7031d95 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalCredentialAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalCredentialAuthenticatorFactory.java @@ -19,6 +19,7 @@ package org.keycloak.authentication.authenticators.conditional; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.credential.CredentialProvider; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalLoaAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalLoaAuthenticator.java index 1b8bd50bfd8..d3c76258cb4 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalLoaAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalLoaAuthenticator.java @@ -17,7 +17,6 @@ package org.keycloak.authentication.authenticators.conditional; -import org.jboss.logging.Logger; import org.keycloak.authentication.AuthenticationFlowCallback; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; @@ -32,6 +31,8 @@ import org.keycloak.models.UserModel; import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionModel; +import org.jboss.logging.Logger; + public class ConditionalLoaAuthenticator implements ConditionalAuthenticator, AuthenticationFlowCallback { public static final String LEVEL = "loa-condition-level"; public static final String MAX_AGE = "loa-max-age"; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalLoaAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalLoaAuthenticatorFactory.java index f5cdac5d54a..a19ebf6425b 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalLoaAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalLoaAuthenticatorFactory.java @@ -18,6 +18,7 @@ package org.keycloak.authentication.authenticators.conditional; import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowCallbackFactory; import org.keycloak.authentication.Authenticator; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalRoleAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalRoleAuthenticator.java index 2720a2c6609..b53d50e5765 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalRoleAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalRoleAuthenticator.java @@ -7,6 +7,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; + import org.jboss.logging.Logger; public class ConditionalRoleAuthenticator implements ConditionalAuthenticator { diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalRoleAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalRoleAuthenticatorFactory.java index 36a9bd701fd..c9faa892ebe 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalRoleAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalRoleAuthenticatorFactory.java @@ -1,14 +1,14 @@ package org.keycloak.authentication.authenticators.conditional; +import java.util.Arrays; +import java.util.List; + import org.keycloak.Config.Scope; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationExecutionModel.Requirement; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Arrays; -import java.util.List; - public class ConditionalRoleAuthenticatorFactory implements ConditionalAuthenticatorFactory { public static final String PROVIDER_ID = "conditional-user-role"; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalSubFlowExecutedAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalSubFlowExecutedAuthenticator.java index 43514d5d8b6..aba767d1cbb 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalSubFlowExecutedAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalSubFlowExecutedAuthenticator.java @@ -18,7 +18,7 @@ package org.keycloak.authentication.authenticators.conditional; import java.util.stream.Stream; -import org.jboss.logging.Logger; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; @@ -28,6 +28,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.sessions.AuthenticationSessionModel; +import org.jboss.logging.Logger; + /** *

Conditional authenticator to know if a sub-flow was executed successfully in the authentication flow.

* diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalSubFlowExecutedAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalSubFlowExecutedAuthenticatorFactory.java index eeb744dd85f..5ed11f96291 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalSubFlowExecutedAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalSubFlowExecutedAuthenticatorFactory.java @@ -18,6 +18,7 @@ package org.keycloak.authentication.authenticators.conditional; import java.util.List; + import org.keycloak.Config.Scope; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationExecutionModel.Requirement; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserAttributeValue.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserAttributeValue.java index ee1a7289f54..a9467d48f9b 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserAttributeValue.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserAttributeValue.java @@ -17,6 +17,10 @@ package org.keycloak.authentication.authenticators.conditional; +import java.util.Map; +import java.util.Objects; +import java.util.regex.Pattern; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.AuthenticationFlowException; @@ -25,10 +29,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; -import java.util.Map; -import java.util.Objects; -import java.util.regex.Pattern; - public class ConditionalUserAttributeValue implements ConditionalAuthenticator { static final ConditionalUserAttributeValue SINGLETON = new ConditionalUserAttributeValue(); diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserAttributeValueFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserAttributeValueFactory.java index cc87c057fa1..e413696d1d3 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserAttributeValueFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserAttributeValueFactory.java @@ -17,14 +17,14 @@ package org.keycloak.authentication.authenticators.conditional; +import java.util.Arrays; +import java.util.List; + import org.keycloak.Config; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Arrays; -import java.util.List; - public class ConditionalUserAttributeValueFactory implements ConditionalAuthenticatorFactory { public static final String PROVIDER_ID = "conditional-user-attribute"; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserConfiguredAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserConfiguredAuthenticatorFactory.java index 0ea228af03c..3e3e2652b62 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserConfiguredAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/conditional/ConditionalUserConfiguredAuthenticatorFactory.java @@ -3,8 +3,8 @@ package org.keycloak.authentication.authenticators.conditional; import java.util.List; import org.keycloak.Config.Scope; -import org.keycloak.models.AuthenticationExecutionModel.Requirement; import org.keycloak.models.AuthenticationExecutionModel; +import org.keycloak.models.AuthenticationExecutionModel.Requirement; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/AbstractDirectGrantAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/AbstractDirectGrantAuthenticator.java index f5b2332c64a..3700bab1147 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/AbstractDirectGrantAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/AbstractDirectGrantAuthenticator.java @@ -17,6 +17,9 @@ package org.keycloak.authentication.authenticators.directgrant; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; @@ -25,9 +28,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.representations.idm.OAuth2ErrorRepresentation; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateOTP.java b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateOTP.java index 1c45f6097f7..305391d53b9 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateOTP.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateOTP.java @@ -17,6 +17,12 @@ package org.keycloak.authentication.authenticators.directgrant; +import java.util.LinkedList; +import java.util.List; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.CredentialValidator; @@ -31,11 +37,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.provider.ProviderConfigProperty; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.util.LinkedList; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidatePassword.java b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidatePassword.java index 9e1e1463c25..6903a6604bf 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidatePassword.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidatePassword.java @@ -17,6 +17,12 @@ package org.keycloak.authentication.authenticators.directgrant; +import java.util.LinkedList; +import java.util.List; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.events.Errors; @@ -27,14 +33,8 @@ import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.idm.CredentialRepresentation; - -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; import org.keycloak.services.managers.AuthenticationManager; -import java.util.LinkedList; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateUsername.java b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateUsername.java index 95d07a36aeb..0d5ed94885d 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateUsername.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/directgrant/ValidateUsername.java @@ -17,6 +17,12 @@ package org.keycloak.authentication.authenticators.directgrant; +import java.util.LinkedList; +import java.util.List; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator; @@ -33,11 +39,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.services.ServicesLogger; import org.keycloak.services.managers.AuthenticationManager; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.util.LinkedList; -import java.util.List; - import static org.keycloak.authentication.authenticators.util.AuthenticatorUtils.getDisabledByBruteForceEventError; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/AbstractSetRequiredActionAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/AbstractSetRequiredActionAuthenticator.java index d9381ffd503..a22d335f678 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/AbstractSetRequiredActionAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/AbstractSetRequiredActionAuthenticator.java @@ -17,6 +17,8 @@ package org.keycloak.authentication.authenticators.resetcred; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; @@ -28,8 +30,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialChooseUser.java b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialChooseUser.java index fe5892b7568..272eaac888f 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialChooseUser.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialChooseUser.java @@ -17,8 +17,11 @@ package org.keycloak.authentication.authenticators.resetcred; -import org.keycloak.models.DefaultActionTokenKey; -import org.jboss.logging.Logger; +import java.util.List; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; @@ -30,6 +33,7 @@ import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; import org.keycloak.models.AuthenticationExecutionModel; +import org.keycloak.models.DefaultActionTokenKey; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; @@ -40,9 +44,7 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.util.List; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialEmail.java b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialEmail.java index e63129490b0..76b2487c8b0 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialEmail.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetCredentialEmail.java @@ -17,7 +17,13 @@ package org.keycloak.authentication.authenticators.resetcred; -import org.keycloak.models.DefaultActionTokenKey; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; @@ -39,6 +45,7 @@ import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticatorConfigModel; +import org.keycloak.models.DefaultActionTokenKey; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; @@ -53,11 +60,6 @@ import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.storage.StorageId; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import jakarta.ws.rs.core.UriBuilder; -import java.util.concurrent.TimeUnit; import org.jboss.logging.Logger; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetOTP.java b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetOTP.java index 3943f840bc1..41d315f1bdb 100755 --- a/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetOTP.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/resetcred/ResetOTP.java @@ -17,6 +17,10 @@ package org.keycloak.authentication.authenticators.resetcred; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; @@ -34,10 +38,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.services.messages.Messages; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - import static java.util.Arrays.asList; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticator.java index e719fa29a82..b22811fc054 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticator.java @@ -1,13 +1,14 @@ package org.keycloak.authentication.authenticators.sessionlimits; -import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -import org.jboss.logging.Logger; + +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.AuthenticationFlowException; @@ -22,6 +23,8 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.utils.StringUtil; +import org.jboss.logging.Logger; + public class UserSessionLimitsAuthenticator implements Authenticator { private static final Logger logger = Logger.getLogger(UserSessionLimitsAuthenticator.class); diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticatorFactory.java index c270ac9414c..e7bffe43055 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/sessionlimits/UserSessionLimitsAuthenticatorFactory.java @@ -1,5 +1,8 @@ package org.keycloak.authentication.authenticators.sessionlimits; +import java.util.Arrays; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -8,9 +11,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Arrays; -import java.util.List; - public class UserSessionLimitsAuthenticatorFactory implements AuthenticatorFactory { public static final String USER_REALM_LIMIT = "userRealmLimit"; public static final String USER_CLIENT_LIMIT = "userClientLimit"; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/util/AcrStore.java b/services/src/main/java/org/keycloak/authentication/authenticators/util/AcrStore.java index f0e73650c13..5ad359cea8c 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/util/AcrStore.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/util/AcrStore.java @@ -24,8 +24,6 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import com.fasterxml.jackson.core.type.TypeReference; -import org.jboss.logging.Logger; import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.authentication.CredentialAction; import org.keycloak.authentication.RequiredActionProvider; @@ -40,6 +38,9 @@ import org.keycloak.models.UserModel; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.core.type.TypeReference; +import org.jboss.logging.Logger; + import static org.keycloak.models.Constants.NO_LOA; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/util/AuthenticatorUtils.java b/services/src/main/java/org/keycloak/authentication/authenticators/util/AuthenticatorUtils.java index c366a8678dd..36cfc940e66 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/util/AuthenticatorUtils.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/util/AuthenticatorUtils.java @@ -17,8 +17,9 @@ package org.keycloak.authentication.authenticators.util; -import com.fasterxml.jackson.core.type.TypeReference; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.util.Map; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.common.util.Time; import org.keycloak.credential.hash.PasswordHashProvider; @@ -34,8 +35,8 @@ import org.keycloak.services.managers.BruteForceProtector; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.Map; +import com.fasterxml.jackson.core.type.TypeReference; +import org.jboss.logging.Logger; import static org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator.USER_SET_BEFORE_USERNAME_PASSWORD_AUTH; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/util/LoAUtil.java b/services/src/main/java/org/keycloak/authentication/authenticators/util/LoAUtil.java index 5a513ba0cc7..abf8aebcf64 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/util/LoAUtil.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/util/LoAUtil.java @@ -29,7 +29,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; import org.keycloak.authentication.AuthenticatorUtil; @@ -45,6 +44,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.cache.CachedRealmModel; +import org.jboss.logging.Logger; + import static org.keycloak.models.Constants.NO_LOA; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticator.java index 7f4886f67ff..0b991c0e922 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticator.java @@ -23,29 +23,29 @@ import java.security.Principal; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; import java.util.function.Function; - import javax.security.auth.x500.X500Principal; + import jakarta.ws.rs.core.Response; -import org.apache.commons.codec.binary.Hex; - -import org.jboss.logging.Logger; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.crypto.UserIdentityExtractor; import org.keycloak.common.crypto.UserIdentityExtractorProvider; +import org.keycloak.crypto.HashException; +import org.keycloak.crypto.JavaAlgorithm; import org.keycloak.events.Details; import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.jose.jws.crypto.HashUtils; -import org.keycloak.crypto.HashException; -import org.keycloak.crypto.JavaAlgorithm; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.services.x509.X509ClientCertificateLookup; +import org.apache.commons.codec.binary.Hex; +import org.jboss.logging.Logger; + /** * @author Peter Nalyvayko diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticatorFactory.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticatorFactory.java index 0d8971c8247..f79b533b7c8 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateAuthenticatorFactory.java @@ -22,13 +22,13 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; -import static java.util.Arrays.asList; - import org.keycloak.Config; import org.keycloak.authentication.AuthenticatorFactory; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; +import static java.util.Arrays.asList; + import static org.keycloak.authentication.authenticators.x509.AbstractX509ClientCertificateAuthenticator.CANONICAL_DN; import static org.keycloak.authentication.authenticators.x509.AbstractX509ClientCertificateAuthenticator.CERTIFICATE_EXTENDED_KEY_USAGE; import static org.keycloak.authentication.authenticators.x509.AbstractX509ClientCertificateAuthenticator.CERTIFICATE_KEY_USAGE; diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateDirectGrantAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateDirectGrantAuthenticator.java index 8889516d335..a6a0094ae87 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateDirectGrantAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/AbstractX509ClientCertificateDirectGrantAuthenticator.java @@ -18,13 +18,14 @@ package org.keycloak.authentication.authenticators.x509; -import org.keycloak.OAuth2Constants; -import org.keycloak.authentication.AuthenticationFlowContext; +import java.util.HashMap; +import java.util.Map; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.HashMap; -import java.util.Map; + +import org.keycloak.OAuth2Constants; +import org.keycloak.authentication.AuthenticationFlowContext; /** * @author Peter Nalyvayko diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/CertificateValidator.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/CertificateValidator.java index 8275255b8c7..1da5abfd9d5 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/CertificateValidator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/CertificateValidator.java @@ -18,8 +18,6 @@ package org.keycloak.authentication.authenticators.x509; -import static org.keycloak.authentication.authenticators.x509.AbstractX509ClientCertificateAuthenticator.CERTIFICATE_POLICY_MODE_ANY; - import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -55,7 +53,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; - import javax.naming.Context; import javax.naming.NamingException; import javax.naming.directory.Attribute; @@ -64,11 +61,6 @@ import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; import javax.security.auth.x500.X500Principal; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.util.EntityUtils; -import org.jboss.logging.Logger; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.util.PemUtils; import org.keycloak.common.util.Time; @@ -80,6 +72,14 @@ import org.keycloak.truststore.TruststoreProvider; import org.keycloak.utils.CRLUtils; import org.keycloak.utils.OCSPProvider; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.util.EntityUtils; +import org.jboss.logging.Logger; + +import static org.keycloak.authentication.authenticators.x509.AbstractX509ClientCertificateAuthenticator.CERTIFICATE_POLICY_MODE_ANY; + /** * @author Peter Nalyvayko * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java index 2d97fcc6e8c..69795df3f01 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/ValidateX509CertificateUsername.java @@ -22,7 +22,6 @@ import java.security.cert.X509Certificate; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator; @@ -32,6 +31,8 @@ import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.UserModel; import org.keycloak.services.ServicesLogger; +import org.jboss.logging.Logger; + import static org.keycloak.authentication.authenticators.util.AuthenticatorUtils.getDisabledByBruteForceEventError; /** diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java index 6ff376d5f13..45641935023 100644 --- a/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java +++ b/services/src/main/java/org/keycloak/authentication/authenticators/x509/X509ClientCertificateAuthenticator.java @@ -22,12 +22,11 @@ import java.security.cert.X509Certificate; import java.util.LinkedList; import java.util.List; import java.util.Map; -import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator; import org.keycloak.events.Details; @@ -39,6 +38,8 @@ import org.keycloak.models.UserModel; import org.keycloak.models.utils.FormMessage; import org.keycloak.services.ServicesLogger; +import org.jboss.logging.Logger; + import static org.keycloak.authentication.authenticators.util.AuthenticatorUtils.getDisabledByBruteForceEventError; /** diff --git a/services/src/main/java/org/keycloak/authentication/forms/AbstractRegistrationRecaptcha.java b/services/src/main/java/org/keycloak/authentication/forms/AbstractRegistrationRecaptcha.java index 1806954c037..207cae2a815 100644 --- a/services/src/main/java/org/keycloak/authentication/forms/AbstractRegistrationRecaptcha.java +++ b/services/src/main/java/org/keycloak/authentication/forms/AbstractRegistrationRecaptcha.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import jakarta.ws.rs.core.MultivaluedMap; -import org.jboss.logging.Logger; + import org.keycloak.Config; import org.keycloak.authentication.FormAction; import org.keycloak.authentication.FormActionFactory; @@ -44,6 +44,8 @@ import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; import org.keycloak.utils.StringUtil; +import org.jboss.logging.Logger; + public abstract class AbstractRegistrationRecaptcha implements FormAction, FormActionFactory { public static final String G_RECAPTCHA_RESPONSE = "g-recaptcha-response"; diff --git a/services/src/main/java/org/keycloak/authentication/forms/RecaptchaAssessmentRequest.java b/services/src/main/java/org/keycloak/authentication/forms/RecaptchaAssessmentRequest.java index d729eb13cf8..efd04bb596d 100644 --- a/services/src/main/java/org/keycloak/authentication/forms/RecaptchaAssessmentRequest.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RecaptchaAssessmentRequest.java @@ -17,10 +17,10 @@ package org.keycloak.authentication.forms; -import static java.lang.String.format; - import com.fasterxml.jackson.annotation.JsonProperty; +import static java.lang.String.format; + public class RecaptchaAssessmentRequest { @JsonProperty("event") private Event event; diff --git a/services/src/main/java/org/keycloak/authentication/forms/RecaptchaAssessmentResponse.java b/services/src/main/java/org/keycloak/authentication/forms/RecaptchaAssessmentResponse.java index 9f801d64e7f..ce4e0ad3289 100644 --- a/services/src/main/java/org/keycloak/authentication/forms/RecaptchaAssessmentResponse.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RecaptchaAssessmentResponse.java @@ -17,13 +17,13 @@ package org.keycloak.authentication.forms; -import static java.lang.String.format; - import java.util.Arrays; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import static java.lang.String.format; + @JsonIgnoreProperties(ignoreUnknown = true) public class RecaptchaAssessmentResponse { diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationPage.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationPage.java index a5ea81a4e8d..0e82a02a6e8 100755 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationPage.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationPage.java @@ -17,7 +17,11 @@ package org.keycloak.authentication.forms; +import java.util.List; + +import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; + import org.keycloak.Config; import org.keycloak.authentication.FormAuthenticator; import org.keycloak.authentication.FormAuthenticatorFactory; @@ -34,12 +38,8 @@ import org.keycloak.models.OrganizationModel; import org.keycloak.organization.OrganizationProvider; import org.keycloak.organization.utils.Organizations; import org.keycloak.provider.ProviderConfigProperty; - -import jakarta.ws.rs.core.Response; import org.keycloak.services.messages.Messages; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationPassword.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationPassword.java index 610afbc53ed..a0afbb3fd16 100755 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationPassword.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationPassword.java @@ -17,6 +17,11 @@ package org.keycloak.authentication.forms; +import java.util.ArrayList; +import java.util.List; + +import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.Config; import org.keycloak.authentication.FormAction; import org.keycloak.authentication.FormActionFactory; @@ -39,10 +44,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; -import jakarta.ws.rs.core.MultivaluedMap; -import java.util.ArrayList; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java index 5b0a88aecb1..7d62574705d 100755 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptcha.java @@ -23,14 +23,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import org.jboss.logging.Logger; import org.keycloak.authentication.ValidationContext; import org.keycloak.connections.httpclient.HttpClientProvider; import org.keycloak.models.AuthenticationExecutionModel; @@ -40,6 +32,15 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; +import org.jboss.logging.Logger; + public class RegistrationRecaptcha extends AbstractRegistrationRecaptcha { private static final Logger LOGGER = Logger.getLogger(RegistrationRecaptcha.class); diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptchaEnterprise.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptchaEnterprise.java index 37b75cd051a..ef13c2f3e86 100644 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptchaEnterprise.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationRecaptchaEnterprise.java @@ -24,13 +24,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.util.EntityUtils; -import org.jboss.logging.Logger; import org.keycloak.authentication.ValidationContext; import org.keycloak.connections.httpclient.HttpClientProvider; import org.keycloak.provider.ProviderConfigProperty; @@ -39,6 +32,14 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; +import org.apache.http.HttpResponse; +import org.apache.http.HttpStatus; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.util.EntityUtils; +import org.jboss.logging.Logger; + public class RegistrationRecaptchaEnterprise extends AbstractRegistrationRecaptcha { public static final String PROVIDER_ID = "registration-recaptcha-enterprise"; diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationTermsAndConditions.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationTermsAndConditions.java index df8eebd72ac..b4e11833c2e 100644 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationTermsAndConditions.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationTermsAndConditions.java @@ -19,7 +19,9 @@ package org.keycloak.authentication.forms; import java.util.Collections; import java.util.List; + import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.Config; import org.keycloak.authentication.FormAction; import org.keycloak.authentication.FormActionFactory; diff --git a/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java b/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java index 5c0f5976cd0..72875c7b3b6 100755 --- a/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java +++ b/services/src/main/java/org/keycloak/authentication/forms/RegistrationUserCreation.java @@ -17,7 +17,12 @@ package org.keycloak.authentication.forms; +import java.util.List; +import java.util.function.Consumer; + import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.AuthenticationFlowException; @@ -50,14 +55,10 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; import org.keycloak.userprofile.Attributes; +import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileContext; import org.keycloak.userprofile.UserProfileProvider; import org.keycloak.userprofile.ValidationException; -import org.keycloak.userprofile.UserProfile; - -import jakarta.ws.rs.core.MultivaluedMap; -import java.util.List; -import java.util.function.Consumer; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/DeleteAccount.java b/services/src/main/java/org/keycloak/authentication/requiredactions/DeleteAccount.java index 7e0eb53c187..129573832ab 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/DeleteAccount.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/DeleteAccount.java @@ -17,8 +17,12 @@ package org.keycloak.authentication.requiredactions; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + import jakarta.ws.rs.ForbiddenException; -import org.jboss.logging.Logger; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.authentication.InitiatedActionSupport; @@ -44,9 +48,7 @@ import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionModel; -import java.util.Collections; -import java.util.List; -import java.util.Objects; +import org.jboss.logging.Logger; public class DeleteAccount implements RequiredActionProvider, RequiredActionFactory { public static final String PROVIDER_ID = "delete_account"; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/DeleteCredentialAction.java b/services/src/main/java/org/keycloak/authentication/requiredactions/DeleteCredentialAction.java index 4733fbc8b53..8c239746b74 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/DeleteCredentialAction.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/DeleteCredentialAction.java @@ -22,6 +22,7 @@ package org.keycloak.authentication.requiredactions; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.authentication.CredentialAction; import org.keycloak.authentication.InitiatedActionSupport; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/RecoveryAuthnCodesAction.java b/services/src/main/java/org/keycloak/authentication/requiredactions/RecoveryAuthnCodesAction.java index 55d0762b837..242b2a3f7ab 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/RecoveryAuthnCodesAction.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/RecoveryAuthnCodesAction.java @@ -1,7 +1,12 @@ package org.keycloak.authentication.requiredactions; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Stream; + import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.authentication.CredentialRegistrator; @@ -27,10 +32,6 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.userprofile.ValidationException; import org.keycloak.validate.ValidationError; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Stream; - import static org.keycloak.utils.CredentialHelper.createRecoveryCodesCredential; public class RecoveryAuthnCodesAction implements RequiredActionProvider, RequiredActionFactory, EnvironmentDependentProviderFactory, CredentialRegistrator { diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java b/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java index cc3c7864b0b..5e147cb5198 100755 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/TermsAndConditions.java @@ -17,6 +17,10 @@ package org.keycloak.authentication.requiredactions; +import java.util.Arrays; + +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.authentication.RequiredActionContext; import org.keycloak.authentication.RequiredActionFactory; @@ -27,9 +31,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.UserModel; import org.keycloak.services.messages.Messages; -import jakarta.ws.rs.core.Response; -import java.util.Arrays; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateEmail.java b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateEmail.java index f67590d7863..e679e276ec6 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateEmail.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateEmail.java @@ -18,8 +18,6 @@ package org.keycloak.authentication.requiredactions; import java.util.ArrayList; -import static org.keycloak.services.messages.Messages.EMAIL_VERIFICATION_PENDING; - import java.util.List; import java.util.Objects; import java.util.concurrent.TimeUnit; @@ -29,7 +27,7 @@ import jakarta.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.authentication.AuthenticatorUtil; @@ -38,6 +36,7 @@ import org.keycloak.authentication.RequiredActionContext; import org.keycloak.authentication.RequiredActionFactory; import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.authentication.actiontoken.updateemail.UpdateEmailActionToken; +import org.keycloak.authentication.requiredactions.util.EmailCooldownManager; import org.keycloak.common.Profile; import org.keycloak.common.util.Time; import org.keycloak.email.EmailException; @@ -69,7 +68,10 @@ import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileContext; import org.keycloak.userprofile.UserProfileProvider; import org.keycloak.userprofile.ValidationException; -import org.keycloak.authentication.requiredactions.util.EmailCooldownManager; + +import org.jboss.logging.Logger; + +import static org.keycloak.services.messages.Messages.EMAIL_VERIFICATION_PENDING; public class UpdateEmail implements RequiredActionProvider, RequiredActionFactory, EnvironmentDependentProviderFactory { 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 83beb804959..a14ac448e04 100755 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdatePassword.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdatePassword.java @@ -17,9 +17,11 @@ package org.keycloak.authentication.requiredactions; +import java.util.concurrent.TimeUnit; + import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.authentication.InitiatedActionSupport; @@ -49,7 +51,7 @@ import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; import org.keycloak.sessions.AuthenticationSessionModel; -import java.util.concurrent.TimeUnit; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java index 7232964217c..7f49696a772 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateProfile.java @@ -17,9 +17,12 @@ package org.keycloak.authentication.requiredactions; -import static java.util.Optional.ofNullable; +import java.util.List; import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.authentication.InitiatedActionSupport; import org.keycloak.authentication.RequiredActionContext; @@ -35,16 +38,13 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.FormMessage; import org.keycloak.services.validation.Validation; -import org.keycloak.userprofile.UserProfileContext; -import org.keycloak.userprofile.ValidationException; -import org.keycloak.userprofile.UserProfile; -import org.keycloak.userprofile.UserProfileProvider; import org.keycloak.userprofile.EventAuditingAttributeChangeListener; +import org.keycloak.userprofile.UserProfile; +import org.keycloak.userprofile.UserProfileContext; +import org.keycloak.userprofile.UserProfileProvider; +import org.keycloak.userprofile.ValidationException; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - -import java.util.List; +import static java.util.Optional.ofNullable; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java index 1321334d4a6..281f7c40c0d 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/UpdateTotp.java @@ -17,7 +17,14 @@ package org.keycloak.authentication.requiredactions; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import java.util.stream.Stream; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -35,13 +42,13 @@ import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; +import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.OTPPolicy; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import org.keycloak.models.Constants; import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.models.credential.RecoveryAuthnCodesCredentialModel; import org.keycloak.models.utils.CredentialValidation; @@ -54,13 +61,7 @@ import org.keycloak.services.validation.Validation; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.utils.CredentialHelper; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.stream.Stream; +import org.jboss.logging.Logger; import static org.keycloak.models.AuthenticationExecutionModel.Requirement.DISABLED; 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 7827064fef9..2c5c1e6f2f2 100755 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyEmail.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/VerifyEmail.java @@ -17,11 +17,15 @@ package org.keycloak.authentication.requiredactions; +import java.util.List; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriBuilderException; import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.authentication.InitiatedActionSupport; @@ -29,6 +33,7 @@ import org.keycloak.authentication.RequiredActionContext; import org.keycloak.authentication.RequiredActionFactory; import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.authentication.actiontoken.verifyemail.VerifyEmailActionToken; +import org.keycloak.authentication.requiredactions.util.EmailCooldownManager; import org.keycloak.common.util.Time; import org.keycloak.email.EmailException; import org.keycloak.email.EmailTemplateProvider; @@ -48,14 +53,10 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.services.Urls; import org.keycloak.services.messages.Messages; import org.keycloak.services.validation.Validation; - import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; -import org.keycloak.authentication.requiredactions.util.EmailCooldownManager; -import java.util.List; -import java.util.Objects; -import java.util.concurrent.TimeUnit; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnPasswordlessRegister.java b/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnPasswordlessRegister.java index 275d6fe18ba..953f1d4b60b 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnPasswordlessRegister.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnPasswordlessRegister.java @@ -18,13 +18,14 @@ package org.keycloak.authentication.requiredactions; -import com.webauthn4j.verifier.attestation.trustworthiness.certpath.CertPathTrustworthinessVerifier; import org.keycloak.authentication.RequiredActionContext; import org.keycloak.credential.WebAuthnPasswordlessCredentialProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.WebAuthnPolicy; import org.keycloak.models.credential.WebAuthnCredentialModel; +import com.webauthn4j.verifier.attestation.trustworthiness.certpath.CertPathTrustworthinessVerifier; + /** * Required action for register WebAuthn passwordless credential for the user. This class is temporary and will be likely * removed in the future during future improvements in authentication SPI diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnPasswordlessRegisterFactory.java b/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnPasswordlessRegisterFactory.java index 5265eba022b..e167953b4a7 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnPasswordlessRegisterFactory.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnPasswordlessRegisterFactory.java @@ -18,9 +18,10 @@ package org.keycloak.authentication.requiredactions; -import com.webauthn4j.verifier.attestation.trustworthiness.certpath.CertPathTrustworthinessVerifier; import org.keycloak.models.KeycloakSession; +import com.webauthn4j.verifier.attestation.trustworthiness.certpath.CertPathTrustworthinessVerifier; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegister.java b/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegister.java index 3d2b4d5118e..5bbe0f70dd9 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegister.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegister.java @@ -30,12 +30,6 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import com.webauthn4j.WebAuthnRegistrationManager; -import com.webauthn4j.data.AuthenticatorTransport; -import org.jboss.logging.Logger; -import org.keycloak.events.EventBuilder; -import org.keycloak.events.EventType; -import org.keycloak.http.HttpRequest; import org.keycloak.WebAuthnConstants; import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.authentication.CredentialRegistrator; @@ -52,6 +46,9 @@ import org.keycloak.credential.WebAuthnCredentialProviderFactory; import org.keycloak.crypto.Algorithm; import org.keycloak.events.Details; import org.keycloak.events.Errors; +import org.keycloak.events.EventBuilder; +import org.keycloak.events.EventType; +import org.keycloak.http.HttpRequest; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; @@ -60,17 +57,19 @@ import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.utils.StringUtil; +import com.webauthn4j.WebAuthnRegistrationManager; import com.webauthn4j.converter.util.ObjectConverter; import com.webauthn4j.data.AttestationConveyancePreference; +import com.webauthn4j.data.AuthenticatorTransport; +import com.webauthn4j.data.RegistrationData; +import com.webauthn4j.data.RegistrationParameters; +import com.webauthn4j.data.RegistrationRequest; import com.webauthn4j.data.attestation.authenticator.AttestedCredentialData; import com.webauthn4j.data.attestation.statement.AttestationStatement; import com.webauthn4j.data.attestation.statement.COSEAlgorithmIdentifier; import com.webauthn4j.data.client.Origin; import com.webauthn4j.data.client.challenge.Challenge; import com.webauthn4j.data.client.challenge.DefaultChallenge; -import com.webauthn4j.data.RegistrationRequest; -import com.webauthn4j.data.RegistrationData; -import com.webauthn4j.data.RegistrationParameters; import com.webauthn4j.server.ServerProperty; import com.webauthn4j.util.exception.WebAuthnException; import com.webauthn4j.verifier.attestation.statement.AttestationStatementVerifier; @@ -82,6 +81,7 @@ import com.webauthn4j.verifier.attestation.statement.tpm.TPMAttestationStatement import com.webauthn4j.verifier.attestation.statement.u2f.FIDOU2FAttestationStatementVerifier; import com.webauthn4j.verifier.attestation.trustworthiness.certpath.CertPathTrustworthinessVerifier; import com.webauthn4j.verifier.attestation.trustworthiness.self.DefaultSelfAttestationTrustworthinessVerifier; +import org.jboss.logging.Logger; import static org.keycloak.WebAuthnConstants.REG_ERR_DETAIL_LABEL; import static org.keycloak.WebAuthnConstants.REG_ERR_LABEL; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegisterFactory.java b/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegisterFactory.java index c579c07585e..03926abf6b9 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegisterFactory.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/WebAuthnRegisterFactory.java @@ -16,11 +16,6 @@ package org.keycloak.authentication.requiredactions; -import com.webauthn4j.anchor.KeyStoreTrustAnchorRepository; -import com.webauthn4j.verifier.attestation.trustworthiness.certpath.CertPathTrustworthinessVerifier; -import com.webauthn4j.verifier.attestation.trustworthiness.certpath.DefaultCertPathTrustworthinessVerifier; -import com.webauthn4j.verifier.attestation.trustworthiness.certpath.NullCertPathTrustworthinessVerifier; - import org.keycloak.Config; import org.keycloak.Config.Scope; import org.keycloak.authentication.RequiredActionFactory; @@ -31,6 +26,11 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.truststore.TruststoreProvider; +import com.webauthn4j.anchor.KeyStoreTrustAnchorRepository; +import com.webauthn4j.verifier.attestation.trustworthiness.certpath.CertPathTrustworthinessVerifier; +import com.webauthn4j.verifier.attestation.trustworthiness.certpath.DefaultCertPathTrustworthinessVerifier; +import com.webauthn4j.verifier.attestation.trustworthiness.certpath.NullCertPathTrustworthinessVerifier; + public class WebAuthnRegisterFactory implements RequiredActionFactory, EnvironmentDependentProviderFactory { public static final String PROVIDER_ID = "webauthn-register"; diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/util/CredentialDeleteHelper.java b/services/src/main/java/org/keycloak/authentication/requiredactions/util/CredentialDeleteHelper.java index f9bb7958dc9..510f3ce239c 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/util/CredentialDeleteHelper.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/util/CredentialDeleteHelper.java @@ -25,7 +25,7 @@ import java.util.function.Supplier; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.NotFoundException; -import org.jboss.logging.Logger; + import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.authentication.authenticators.util.LoAUtil; import org.keycloak.credential.CredentialModel; @@ -36,6 +36,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import org.jboss.logging.Logger; + import static org.keycloak.models.Constants.NO_LOA; /** diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/util/EmailCooldownManager.java b/services/src/main/java/org/keycloak/authentication/requiredactions/util/EmailCooldownManager.java index faa76d426f1..382a97007fd 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/util/EmailCooldownManager.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/util/EmailCooldownManager.java @@ -19,13 +19,14 @@ package org.keycloak.authentication.requiredactions.util; import java.util.Map; -import org.jboss.logging.Logger; import org.keycloak.authentication.RequiredActionContext; import org.keycloak.common.util.Time; import org.keycloak.models.RequiredActionProviderModel; import org.keycloak.models.SingleUseObjectProvider; import org.keycloak.provider.ProviderConfigProperty; +import org.jboss.logging.Logger; + public class EmailCooldownManager { private static final Logger logger = Logger.getLogger(EmailCooldownManager.class); diff --git a/services/src/main/java/org/keycloak/authentication/requiredactions/util/RequiredActionsValidator.java b/services/src/main/java/org/keycloak/authentication/requiredactions/util/RequiredActionsValidator.java index fbe871c3ac3..bff210f7b50 100644 --- a/services/src/main/java/org/keycloak/authentication/requiredactions/util/RequiredActionsValidator.java +++ b/services/src/main/java/org/keycloak/authentication/requiredactions/util/RequiredActionsValidator.java @@ -17,12 +17,12 @@ package org.keycloak.authentication.requiredactions.util; +import java.util.List; + import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import java.util.List; - public class RequiredActionsValidator { /** * Validate provided required actions diff --git a/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java b/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java index b11eef20796..951cd5778bb 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/AuthorizationService.java @@ -21,7 +21,6 @@ package org.keycloak.authorization.admin; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.Path; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.models.ClientModel; @@ -30,6 +29,8 @@ import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/admin/PermissionService.java b/services/src/main/java/org/keycloak/authorization/admin/PermissionService.java index 8458ad91028..f24b7b3cd35 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PermissionService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PermissionService.java @@ -19,7 +19,6 @@ package org.keycloak.authorization.admin; import java.util.List; import java.util.Map; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; @@ -29,6 +28,8 @@ import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java index b07f4b7138a..580a1c3299c 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyEvaluationService.java @@ -39,19 +39,13 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.admin.representation.PolicyEvaluationResponseBuilder; import org.keycloak.authorization.attribute.Attributes; import org.keycloak.authorization.common.DefaultEvaluationContext; import org.keycloak.authorization.common.KeycloakIdentity; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.model.ResourceWrapper; @@ -87,6 +81,13 @@ import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.sessions.AuthenticationSessionModel; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.jboss.logging.Logger; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java index 36c440f700d..ea79a11ecc4 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java @@ -30,9 +30,8 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.policy.provider.PolicyProviderFactory; @@ -47,10 +46,12 @@ import org.keycloak.representations.idm.authorization.AbstractPolicyRepresentati import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.resources.admin.AdminEventBuilder; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.util.JsonSerialization; +import org.jboss.resteasy.reactive.NoCache; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java index 091dcacd842..aec05ae62c1 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java @@ -36,15 +36,8 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.ResourceServer; @@ -71,6 +64,14 @@ import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.jboss.resteasy.reactive.NoCache; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeResourceService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeResourceService.java index 5b5bcfb6f0d..04170e12c32 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeResourceService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeResourceService.java @@ -23,8 +23,8 @@ import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.authorization.AbstractPolicyRepresentation; -import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.resources.admin.AdminEventBuilder; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.util.JsonSerialization; /** diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java index 1306df8aed2..3b94ccb0f3b 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyTypeService.java @@ -29,8 +29,8 @@ import org.keycloak.authorization.policy.provider.PolicyProviderAdminService; import org.keycloak.authorization.policy.provider.PolicyProviderFactory; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.authorization.AbstractPolicyRepresentation; -import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.resources.admin.AdminEventBuilder; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.util.JsonSerialization; /** diff --git a/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java b/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java index a84645c62ac..a9a47fe99e3 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/ResourceServerService.java @@ -17,9 +17,6 @@ */ package org.keycloak.authorization.admin; -import static org.keycloak.models.utils.ModelToRepresentation.toRepresentation; - - import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; @@ -30,10 +27,8 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriInfo; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -47,6 +42,11 @@ import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; + +import static org.keycloak.models.utils.ModelToRepresentation.toRepresentation; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java b/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java index 94c350c6e40..6b03f61aa27 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java @@ -16,9 +16,6 @@ */ package org.keycloak.authorization.admin; -import static org.keycloak.models.utils.ModelToRepresentation.toRepresentation; -import static org.keycloak.models.utils.RepresentationToModel.toModel; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -45,16 +42,9 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.jboss.resteasy.reactive.NoCache; import org.keycloak.OAuthErrorException; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.ResourceServer; @@ -79,6 +69,17 @@ import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.jboss.resteasy.reactive.NoCache; + +import static org.keycloak.models.utils.ModelToRepresentation.toRepresentation; +import static org.keycloak.models.utils.RepresentationToModel.toModel; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java b/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java index c83226fb05c..267e3019943 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java @@ -16,15 +16,28 @@ */ package org.keycloak.authorization.admin; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; +import java.util.Collections; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.ResourceServer; @@ -43,25 +56,13 @@ import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; - -import java.util.Collections; -import java.util.EnumMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.jboss.resteasy.reactive.NoCache; import static org.keycloak.models.utils.ModelToRepresentation.toRepresentation; import static org.keycloak.models.utils.RepresentationToModel.toModel; diff --git a/services/src/main/java/org/keycloak/authorization/admin/representation/FGAPPolicyEvaluationResponseBuilder.java b/services/src/main/java/org/keycloak/authorization/admin/representation/FGAPPolicyEvaluationResponseBuilder.java index 2d45abe5677..10038ca0113 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/representation/FGAPPolicyEvaluationResponseBuilder.java +++ b/services/src/main/java/org/keycloak/authorization/admin/representation/FGAPPolicyEvaluationResponseBuilder.java @@ -24,10 +24,10 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.Decision.Effect; import org.keycloak.authorization.admin.PolicyEvaluationService.EvaluationDecisionCollector; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.ResourceServer; diff --git a/services/src/main/java/org/keycloak/authorization/admin/representation/PolicyEvaluationResponseBuilder.java b/services/src/main/java/org/keycloak/authorization/admin/representation/PolicyEvaluationResponseBuilder.java index 15ed662fdb8..ce0258c6cf4 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/representation/PolicyEvaluationResponseBuilder.java +++ b/services/src/main/java/org/keycloak/authorization/admin/representation/PolicyEvaluationResponseBuilder.java @@ -16,11 +16,24 @@ */ package org.keycloak.authorization.admin.representation; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.Decision; import org.keycloak.authorization.admin.PolicyEvaluationService.EvaluationDecisionCollector; import org.keycloak.authorization.common.KeycloakIdentity; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; @@ -39,19 +52,6 @@ import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/authorization/authorization/AuthorizationTokenService.java b/services/src/main/java/org/keycloak/authorization/authorization/AuthorizationTokenService.java index a47689e7206..bfe00951d87 100644 --- a/services/src/main/java/org/keycloak/authorization/authorization/AuthorizationTokenService.java +++ b/services/src/main/java/org/keycloak/authorization/authorization/AuthorizationTokenService.java @@ -39,16 +39,14 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; import org.keycloak.OAuthErrorException; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.common.DefaultEvaluationContext; import org.keycloak.authorization.common.KeycloakIdentity; +import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.model.Scope; -import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.permission.Permissions; import org.keycloak.authorization.permission.ResourcePermission; import org.keycloak.authorization.policy.evaluation.EvaluationContext; @@ -65,6 +63,7 @@ import org.keycloak.common.util.PathMatcher; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; +import org.keycloak.http.HttpRequest; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSessionContext; @@ -94,10 +93,12 @@ import org.keycloak.services.cors.Cors; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.services.managers.UserSessionManager; +import org.keycloak.services.util.DefaultClientSessionContext; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.JsonSerialization; -import org.keycloak.services.util.DefaultClientSessionContext; + +import org.jboss.logging.Logger; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/authorization/common/DefaultEvaluationContext.java b/services/src/main/java/org/keycloak/authorization/common/DefaultEvaluationContext.java index 31315660434..bdcdd93cd32 100644 --- a/services/src/main/java/org/keycloak/authorization/common/DefaultEvaluationContext.java +++ b/services/src/main/java/org/keycloak/authorization/common/DefaultEvaluationContext.java @@ -18,12 +18,6 @@ package org.keycloak.authorization.common; -import org.keycloak.authorization.attribute.Attributes; -import org.keycloak.authorization.identity.Identity; -import org.keycloak.authorization.policy.evaluation.EvaluationContext; -import org.keycloak.models.KeycloakSession; -import org.keycloak.representations.AccessToken; - import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Collection; @@ -33,6 +27,12 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import org.keycloak.authorization.attribute.Attributes; +import org.keycloak.authorization.identity.Identity; +import org.keycloak.authorization.policy.evaluation.EvaluationContext; +import org.keycloak.models.KeycloakSession; +import org.keycloak.representations.AccessToken; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/common/KeycloakIdentity.java b/services/src/main/java/org/keycloak/authorization/common/KeycloakIdentity.java index ab55e183fd5..750f3264890 100644 --- a/services/src/main/java/org/keycloak/authorization/common/KeycloakIdentity.java +++ b/services/src/main/java/org/keycloak/authorization/common/KeycloakIdentity.java @@ -17,8 +17,15 @@ */ package org.keycloak.authorization.common; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.authorization.attribute.Attributes; import org.keycloak.authorization.identity.Identity; import org.keycloak.authorization.util.Tokens; @@ -39,13 +46,8 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.util.DefaultClientSessionContext; import org.keycloak.util.JsonSerialization; -import jakarta.ws.rs.core.Response.Status; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/authorization/config/UmaConfiguration.java b/services/src/main/java/org/keycloak/authorization/config/UmaConfiguration.java index d240d27f900..8678ca1dd88 100644 --- a/services/src/main/java/org/keycloak/authorization/config/UmaConfiguration.java +++ b/services/src/main/java/org/keycloak/authorization/config/UmaConfiguration.java @@ -19,7 +19,6 @@ package org.keycloak.authorization.config; import jakarta.ws.rs.core.UriBuilder; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.authorization.AuthorizationService; import org.keycloak.authorization.protection.ProtectionService; import org.keycloak.models.KeycloakSession; @@ -30,6 +29,8 @@ import org.keycloak.services.resources.RealmsResource; import org.keycloak.urls.UrlType; import org.keycloak.wellknown.WellKnownProvider; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/protection/ProtectionService.java b/services/src/main/java/org/keycloak/authorization/protection/ProtectionService.java index c2e9c5d8e3d..648a4262c8b 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/ProtectionService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/ProtectionService.java @@ -17,12 +17,17 @@ */ package org.keycloak.authorization.protection; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.OAuthErrorException; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.admin.ResourceSetService; import org.keycloak.authorization.common.KeycloakIdentity; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.protection.permission.PermissionService; +import org.keycloak.authorization.protection.permission.PermissionTicketService; +import org.keycloak.authorization.protection.policy.UserManagedPermissionService; import org.keycloak.authorization.protection.resource.ResourceService; import org.keycloak.common.ClientConnection; import org.keycloak.models.ClientModel; @@ -33,11 +38,6 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.admin.AdminAuth; import org.keycloak.services.resources.admin.AdminEventBuilder; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.core.Response.Status; -import org.keycloak.authorization.protection.permission.PermissionTicketService; -import org.keycloak.authorization.protection.policy.UserManagedPermissionService; - /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/protection/introspect/RPTIntrospectionProvider.java b/services/src/main/java/org/keycloak/authorization/protection/introspect/RPTIntrospectionProvider.java index 8e883d70d2a..7ae99057923 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/introspect/RPTIntrospectionProvider.java +++ b/services/src/main/java/org/keycloak/authorization/protection/introspect/RPTIntrospectionProvider.java @@ -25,9 +25,6 @@ import java.util.stream.Collectors; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.jboss.logging.Logger; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; @@ -38,6 +35,10 @@ import org.keycloak.representations.AccessToken.Authorization; import org.keycloak.representations.idm.authorization.Permission; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.jboss.logging.Logger; + /** * Introspects token accordingly with UMA Bearer Token Profile. * diff --git a/services/src/main/java/org/keycloak/authorization/protection/permission/AbstractPermissionService.java b/services/src/main/java/org/keycloak/authorization/protection/permission/AbstractPermissionService.java index 367317ac1c0..417a2066d76 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/permission/AbstractPermissionService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/permission/AbstractPermissionService.java @@ -16,6 +16,16 @@ */ package org.keycloak.authorization.protection.permission; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.common.KeycloakIdentity; import org.keycloak.authorization.model.Resource; @@ -29,15 +39,6 @@ import org.keycloak.representations.idm.authorization.PermissionTicketToken; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.Urls; -import jakarta.ws.rs.core.Response; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionService.java b/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionService.java index b52fa3d6957..317564aed4c 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionService.java @@ -17,16 +17,17 @@ */ package org.keycloak.authorization.protection.permission; -import org.keycloak.authorization.AuthorizationProvider; -import org.keycloak.authorization.common.KeycloakIdentity; -import org.keycloak.authorization.model.ResourceServer; -import org.keycloak.representations.idm.authorization.PermissionRequest; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.common.KeycloakIdentity; +import org.keycloak.authorization.model.ResourceServer; +import org.keycloak.representations.idm.authorization.PermissionRequest; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionTicketService.java b/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionTicketService.java index 3c375498868..5e780dfaf87 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionTicketService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/permission/PermissionTicketService.java @@ -16,6 +16,21 @@ */ package org.keycloak.authorization.protection.permission; +import java.util.EnumMap; +import java.util.Map; +import java.util.stream.Collectors; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuthErrorException; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.common.KeycloakIdentity; @@ -36,20 +51,6 @@ import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.authorization.PermissionTicketRepresentation; import org.keycloak.services.ErrorResponseException; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Response; -import java.util.EnumMap; -import java.util.Map; -import java.util.stream.Collectors; - /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java b/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java index 158ba88322c..4b71bb289e9 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java @@ -32,7 +32,6 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.jboss.resteasy.reactive.NoCache; import org.keycloak.OAuthErrorException; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.admin.PermissionService; @@ -48,6 +47,8 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.util.JsonSerialization; +import org.jboss.resteasy.reactive.NoCache; + /** * @author Federico M. Facca */ diff --git a/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java b/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java index a0eaee91bdb..decc1aecbae 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java @@ -31,7 +31,6 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.jboss.resteasy.reactive.NoCache; import org.keycloak.authorization.admin.ResourceSetService; import org.keycloak.authorization.identity.Identity; import org.keycloak.authorization.model.Resource; @@ -42,6 +41,8 @@ import org.keycloak.representations.idm.authorization.ResourceOwnerRepresentatio import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.services.ErrorResponseException; +import org.jboss.resteasy.reactive.NoCache; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/authorization/protection/resource/UmaResourceRepresentation.java b/services/src/main/java/org/keycloak/authorization/protection/resource/UmaResourceRepresentation.java index ca5d6753cca..a7a67a63efb 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/resource/UmaResourceRepresentation.java +++ b/services/src/main/java/org/keycloak/authorization/protection/resource/UmaResourceRepresentation.java @@ -19,11 +19,12 @@ package org.keycloak.authorization.protection.resource; import java.util.Set; import java.util.stream.Collectors; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.authorization.model.Resource; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesIdentityProvider.java b/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesIdentityProvider.java index 56d2dd9705b..38bdd0c47aa 100644 --- a/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesIdentityProvider.java +++ b/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesIdentityProvider.java @@ -1,6 +1,7 @@ package org.keycloak.broker.kubernetes; -import org.jboss.logging.Logger; +import java.nio.charset.StandardCharsets; + import org.keycloak.authentication.ClientAuthenticationFlowContext; import org.keycloak.authentication.authenticators.client.AbstractJWTClientValidator; import org.keycloak.authentication.authenticators.client.FederatedJWTClientValidator; @@ -13,7 +14,7 @@ import org.keycloak.keys.PublicKeyStorageProvider; import org.keycloak.keys.PublicKeyStorageUtils; import org.keycloak.models.KeycloakSession; -import java.nio.charset.StandardCharsets; +import org.jboss.logging.Logger; public class KubernetesIdentityProvider implements ClientAssertionIdentityProvider { diff --git a/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesIdentityProviderFactory.java b/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesIdentityProviderFactory.java index 5a50425d0de..a1d7e4463e8 100644 --- a/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesIdentityProviderFactory.java @@ -1,5 +1,7 @@ package org.keycloak.broker.kubernetes; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.broker.provider.AbstractIdentityProviderFactory; import org.keycloak.common.Profile; @@ -7,8 +9,6 @@ import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.EnvironmentDependentProviderFactory; -import java.util.Map; - import static org.keycloak.broker.kubernetes.KubernetesConstants.KUBERNETES_SERVICE_HOST_KEY; import static org.keycloak.broker.kubernetes.KubernetesConstants.KUBERNETES_SERVICE_PORT_HTTPS_KEY; diff --git a/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesJwksEndpointLoader.java b/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesJwksEndpointLoader.java index 7af579ac2e4..13730cb9ff9 100644 --- a/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesJwksEndpointLoader.java +++ b/services/src/main/java/org/keycloak/broker/kubernetes/KubernetesJwksEndpointLoader.java @@ -1,10 +1,8 @@ package org.keycloak.broker.kubernetes; -import org.apache.commons.io.FileUtils; -import org.apache.http.HttpHeaders; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; +import java.io.File; +import java.nio.charset.StandardCharsets; + import org.keycloak.connections.httpclient.HttpClientProvider; import org.keycloak.crypto.PublicKeysWrapper; import org.keycloak.jose.jwk.JSONWebKeySet; @@ -14,8 +12,11 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.util.JWKSUtils; import org.keycloak.util.JsonSerialization; -import java.io.File; -import java.nio.charset.StandardCharsets; +import org.apache.commons.io.FileUtils; +import org.apache.http.HttpHeaders; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; import static org.keycloak.broker.kubernetes.KubernetesConstants.SERVICE_ACCOUNT_TOKEN_PATH; diff --git a/services/src/main/java/org/keycloak/broker/oauth/OAuth2IdentityProvider.java b/services/src/main/java/org/keycloak/broker/oauth/OAuth2IdentityProvider.java index 4b66c10e83b..f567dce5f4c 100755 --- a/services/src/main/java/org/keycloak/broker/oauth/OAuth2IdentityProvider.java +++ b/services/src/main/java/org/keycloak/broker/oauth/OAuth2IdentityProvider.java @@ -16,10 +16,12 @@ */ package org.keycloak.broker.oauth; -import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider; import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper; @@ -31,7 +33,7 @@ import org.keycloak.http.simple.SimpleHttpResponse; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.TokenExchangeContext; -import java.io.IOException; +import com.fasterxml.jackson.databind.JsonNode; public class OAuth2IdentityProvider extends AbstractOAuth2IdentityProvider { diff --git a/services/src/main/java/org/keycloak/broker/oauth/OAuth2IdentityProviderFactory.java b/services/src/main/java/org/keycloak/broker/oauth/OAuth2IdentityProviderFactory.java index 4de3e596023..a6da38d51d4 100755 --- a/services/src/main/java/org/keycloak/broker/oauth/OAuth2IdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/broker/oauth/OAuth2IdentityProviderFactory.java @@ -16,6 +16,9 @@ */ package org.keycloak.broker.oauth; +import java.io.IOException; +import java.util.Map; + import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.broker.provider.AbstractIdentityProviderFactory; @@ -26,9 +29,6 @@ import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentatio import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; -import java.io.IOException; -import java.util.Map; - public class OAuth2IdentityProviderFactory extends AbstractIdentityProviderFactory { public static final String PROVIDER_ID = "oauth2"; diff --git a/services/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java b/services/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java index 511a7ad525a..691f9fab0e9 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java +++ b/services/src/main/java/org/keycloak/broker/oidc/AbstractOAuth2IdentityProvider.java @@ -16,11 +16,22 @@ */ package org.keycloak.broker.oidc; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.net.URI; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; + import jakarta.ws.rs.GET; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.WebApplicationException; @@ -30,7 +41,7 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.broker.provider.AbstractIdentityProvider; @@ -95,21 +106,12 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; import org.keycloak.vault.VaultStringSecret; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; -import java.io.IOException; -import java.net.URI; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.jboss.logging.Logger; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProvider.java b/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProvider.java index 7811b04bb51..57d8e3d7468 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProvider.java +++ b/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProvider.java @@ -17,6 +17,13 @@ package org.keycloak.broker.oidc; +import java.io.IOException; + +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -37,12 +44,6 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.util.JsonSerialization; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.io.IOException; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProviderFactory.java b/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProviderFactory.java index d4c9c4637fb..0933511ef53 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/broker/oidc/KeycloakOIDCIdentityProviderFactory.java @@ -16,12 +16,12 @@ */ package org.keycloak.broker.oidc; +import java.util.Map; + import org.keycloak.broker.provider.AbstractIdentityProviderFactory; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; -import java.util.Map; - /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/broker/oidc/OAuth2IdentityProviderConfig.java b/services/src/main/java/org/keycloak/broker/oidc/OAuth2IdentityProviderConfig.java index e9e51c10695..67323111a26 100644 --- a/services/src/main/java/org/keycloak/broker/oidc/OAuth2IdentityProviderConfig.java +++ b/services/src/main/java/org/keycloak/broker/oidc/OAuth2IdentityProviderConfig.java @@ -16,7 +16,7 @@ */ package org.keycloak.broker.oidc; -import static org.keycloak.common.util.UriUtils.checkUrl; +import java.util.Arrays; import org.keycloak.OAuth2Constants; import org.keycloak.common.enums.SslRequired; @@ -25,7 +25,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.representations.IDToken; -import java.util.Arrays; +import static org.keycloak.common.util.UriUtils.checkUrl; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java b/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java index 60cbdb474e8..944f8d4361d 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java +++ b/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProvider.java @@ -16,7 +16,16 @@ */ package org.keycloak.broker.oidc; -import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.QueryParam; @@ -26,18 +35,18 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.ClientAuthenticationFlowContext; import org.keycloak.authentication.authenticators.client.FederatedJWTClientValidator; import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper; import org.keycloak.broker.provider.AuthenticationRequest; -import org.keycloak.broker.provider.JWTAuthorizationGrantProvider; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.ClientAssertionIdentityProvider; import org.keycloak.broker.provider.ExchangeExternalToken; import org.keycloak.broker.provider.IdentityBrokerException; +import org.keycloak.broker.provider.JWTAuthorizationGrantProvider; import org.keycloak.common.Profile; import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.SecretGenerator; @@ -67,9 +76,9 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; +import org.keycloak.protocol.oidc.JWTAuthorizationGrantValidationContext; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.TokenExchangeContext; -import org.keycloak.protocol.oidc.JWTAuthorizationGrantValidationContext; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.IDToken; import org.keycloak.representations.JsonWebToken; @@ -87,15 +96,8 @@ import org.keycloak.util.TokenUtil; import org.keycloak.utils.StringUtil; import org.keycloak.vault.VaultStringSecret; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; +import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderConfig.java b/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderConfig.java index 785f6ad2cfd..b37c1d99c4c 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderConfig.java +++ b/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderConfig.java @@ -16,12 +16,12 @@ */ package org.keycloak.broker.oidc; -import static org.keycloak.common.util.UriUtils.checkUrl; - import org.keycloak.common.enums.SslRequired; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.RealmModel; +import static org.keycloak.common.util.UriUtils.checkUrl; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderFactory.java b/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderFactory.java index e6b32bc3964..d629be4b289 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/broker/oidc/OIDCIdentityProviderFactory.java @@ -16,15 +16,15 @@ */ package org.keycloak.broker.oidc; +import java.io.IOException; +import java.util.Map; + import org.keycloak.broker.provider.AbstractIdentityProviderFactory; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.Map; - /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimMapper.java b/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimMapper.java index 057e4e42ed4..93c3c2b3169 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimMapper.java +++ b/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimMapper.java @@ -17,9 +17,9 @@ package org.keycloak.broker.oidc.mappers; -import static org.keycloak.utils.JsonUtils.splitClaimPath; +import java.util.List; +import java.util.Map; -import com.fasterxml.jackson.databind.JsonNode; import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider; import org.keycloak.broker.oidc.OIDCIdentityProvider; import org.keycloak.broker.provider.AbstractIdentityProviderMapper; @@ -30,8 +30,9 @@ import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.representations.JsonWebToken; import org.keycloak.util.JsonSerialization; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.databind.JsonNode; + +import static org.keycloak.utils.JsonUtils.splitClaimPath; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimToGroupMapper.java b/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimToGroupMapper.java index 9f873bc7f4e..5557731dd04 100644 --- a/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimToGroupMapper.java +++ b/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimToGroupMapper.java @@ -17,7 +17,6 @@ package org.keycloak.broker.oidc.mappers; -import org.jboss.logging.Logger; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.models.GroupModel; @@ -27,6 +26,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; +import org.jboss.logging.Logger; + /** * @author Artur Baltabayev, * Daniel Fesenmeyer diff --git a/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimToRoleMapper.java b/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimToRoleMapper.java index 6f0bc7666e9..c5ee04ca625 100644 --- a/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimToRoleMapper.java +++ b/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractClaimToRoleMapper.java @@ -16,7 +16,6 @@ */ package org.keycloak.broker.oidc.mappers; -import org.jboss.logging.Logger; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.models.IdentityProviderMapperModel; @@ -26,6 +25,8 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; +import org.jboss.logging.Logger; + /** * Abstract class that handles the logic for importing and updating brokered users for all mappers that map an OIDC * claim into a {@code Keycloak} role. diff --git a/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractJsonUserAttributeMapper.java b/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractJsonUserAttributeMapper.java index 01fc4f0b1c8..122bbe7f852 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractJsonUserAttributeMapper.java +++ b/services/src/main/java/org/keycloak/broker/oidc/mappers/AbstractJsonUserAttributeMapper.java @@ -17,10 +17,12 @@ package org.keycloak.broker.oidc.mappers; -import static org.keycloak.utils.JsonUtils.splitClaimPath; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; -import com.fasterxml.jackson.databind.JsonNode; -import org.jboss.logging.Logger; import org.keycloak.broker.oidc.OIDCIdentityProvider; import org.keycloak.broker.provider.AbstractIdentityProviderMapper; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -31,11 +33,10 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; + +import static org.keycloak.utils.JsonUtils.splitClaimPath; /** * Abstract class for Social Provider mappers which allow mapping of JSON user profile field into Keycloak user diff --git a/services/src/main/java/org/keycloak/broker/oidc/mappers/AdvancedClaimToGroupMapper.java b/services/src/main/java/org/keycloak/broker/oidc/mappers/AdvancedClaimToGroupMapper.java index 2c37c25bec0..bc84882f40c 100644 --- a/services/src/main/java/org/keycloak/broker/oidc/mappers/AdvancedClaimToGroupMapper.java +++ b/services/src/main/java/org/keycloak/broker/oidc/mappers/AdvancedClaimToGroupMapper.java @@ -17,6 +17,10 @@ package org.keycloak.broker.oidc.mappers; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -25,10 +29,6 @@ import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import static org.keycloak.utils.RegexUtils.valueMatchesRegex; public class AdvancedClaimToGroupMapper extends AbstractClaimToGroupMapper { diff --git a/services/src/main/java/org/keycloak/broker/oidc/mappers/AdvancedClaimToRoleMapper.java b/services/src/main/java/org/keycloak/broker/oidc/mappers/AdvancedClaimToRoleMapper.java index 361a5653308..44987ae9e8c 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/mappers/AdvancedClaimToRoleMapper.java +++ b/services/src/main/java/org/keycloak/broker/oidc/mappers/AdvancedClaimToRoleMapper.java @@ -17,6 +17,13 @@ package org.keycloak.broker.oidc.mappers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -25,13 +32,6 @@ import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import static org.keycloak.utils.RegexUtils.valueMatchesRegex; /** diff --git a/services/src/main/java/org/keycloak/broker/oidc/mappers/ClaimToRoleMapper.java b/services/src/main/java/org/keycloak/broker/oidc/mappers/ClaimToRoleMapper.java index 7b24624f2d8..69fdb60d5ef 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/mappers/ClaimToRoleMapper.java +++ b/services/src/main/java/org/keycloak/broker/oidc/mappers/ClaimToRoleMapper.java @@ -17,6 +17,12 @@ package org.keycloak.broker.oidc.mappers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -25,12 +31,6 @@ import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/broker/oidc/mappers/ClaimToUserSessionNoteMapper.java b/services/src/main/java/org/keycloak/broker/oidc/mappers/ClaimToUserSessionNoteMapper.java index 9606882bb13..0e8e3f64222 100644 --- a/services/src/main/java/org/keycloak/broker/oidc/mappers/ClaimToUserSessionNoteMapper.java +++ b/services/src/main/java/org/keycloak/broker/oidc/mappers/ClaimToUserSessionNoteMapper.java @@ -1,8 +1,12 @@ package org.keycloak.broker.oidc.mappers; -import static org.keycloak.utils.RegexUtils.valueMatchesRegex; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; -import org.jboss.logging.Logger; import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -13,12 +17,9 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.jboss.logging.Logger; + +import static org.keycloak.utils.RegexUtils.valueMatchesRegex; public class ClaimToUserSessionNoteMapper extends AbstractClaimMapper { diff --git a/services/src/main/java/org/keycloak/broker/oidc/mappers/ExternalKeycloakRoleToRoleMapper.java b/services/src/main/java/org/keycloak/broker/oidc/mappers/ExternalKeycloakRoleToRoleMapper.java index 616668f16c3..670323dd60f 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/mappers/ExternalKeycloakRoleToRoleMapper.java +++ b/services/src/main/java/org/keycloak/broker/oidc/mappers/ExternalKeycloakRoleToRoleMapper.java @@ -17,6 +17,12 @@ package org.keycloak.broker.oidc.mappers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider; import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -30,12 +36,6 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.JsonWebToken; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/broker/oidc/mappers/UserAttributeMapper.java b/services/src/main/java/org/keycloak/broker/oidc/mappers/UserAttributeMapper.java index af4e00ad810..bea9c11d698 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/mappers/UserAttributeMapper.java +++ b/services/src/main/java/org/keycloak/broker/oidc/mappers/UserAttributeMapper.java @@ -17,6 +17,16 @@ package org.keycloak.broker.oidc.mappers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.function.Consumer; +import java.util.stream.Collectors; + import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -29,16 +39,6 @@ import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.saml.common.util.StringUtil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.function.Consumer; -import java.util.stream.Collectors; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/broker/oidc/mappers/UsernameTemplateMapper.java b/services/src/main/java/org/keycloak/broker/oidc/mappers/UsernameTemplateMapper.java index 7d1d1a95a92..3c3ed71a0c5 100755 --- a/services/src/main/java/org/keycloak/broker/oidc/mappers/UsernameTemplateMapper.java +++ b/services/src/main/java/org/keycloak/broker/oidc/mappers/UsernameTemplateMapper.java @@ -17,6 +17,17 @@ package org.keycloak.broker.oidc.mappers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.function.UnaryOperator; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -41,16 +52,6 @@ import org.keycloak.social.paypal.PayPalIdentityProviderFactory; import org.keycloak.social.stackoverflow.StackoverflowIdentityProviderFactory; import org.keycloak.social.twitter.TwitterIdentityProviderFactory; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Optional; -import java.util.Set; -import java.util.function.UnaryOperator; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import static org.keycloak.broker.saml.mappers.UsernameTemplateMapper.TARGET; import static org.keycloak.broker.saml.mappers.UsernameTemplateMapper.TARGETS; import static org.keycloak.broker.saml.mappers.UsernameTemplateMapper.TRANSFORMERS; diff --git a/services/src/main/java/org/keycloak/broker/provider/HardcodedAttributeMapper.java b/services/src/main/java/org/keycloak/broker/provider/HardcodedAttributeMapper.java index c25167eea0c..7a688e37764 100755 --- a/services/src/main/java/org/keycloak/broker/provider/HardcodedAttributeMapper.java +++ b/services/src/main/java/org/keycloak/broker/provider/HardcodedAttributeMapper.java @@ -17,6 +17,12 @@ package org.keycloak.broker.provider; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.models.KeycloakSession; @@ -24,12 +30,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/broker/provider/HardcodedGroupMapper.java b/services/src/main/java/org/keycloak/broker/provider/HardcodedGroupMapper.java index 3e020c29791..0eab0082a42 100755 --- a/services/src/main/java/org/keycloak/broker/provider/HardcodedGroupMapper.java +++ b/services/src/main/java/org/keycloak/broker/provider/HardcodedGroupMapper.java @@ -17,15 +17,15 @@ package org.keycloak.broker.provider; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; + import org.keycloak.broker.oidc.mappers.AbstractClaimToGroupMapper; import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.List; - /** * @author Daniele Martinoli * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/broker/provider/HardcodedRoleMapper.java b/services/src/main/java/org/keycloak/broker/provider/HardcodedRoleMapper.java index 24278ffd82e..f8a76cc1a2d 100755 --- a/services/src/main/java/org/keycloak/broker/provider/HardcodedRoleMapper.java +++ b/services/src/main/java/org/keycloak/broker/provider/HardcodedRoleMapper.java @@ -17,7 +17,12 @@ package org.keycloak.broker.provider; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.models.KeycloakSession; @@ -27,11 +32,7 @@ import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/broker/provider/HardcodedUserSessionAttributeMapper.java b/services/src/main/java/org/keycloak/broker/provider/HardcodedUserSessionAttributeMapper.java index a541524d895..12017d8e49a 100755 --- a/services/src/main/java/org/keycloak/broker/provider/HardcodedUserSessionAttributeMapper.java +++ b/services/src/main/java/org/keycloak/broker/provider/HardcodedUserSessionAttributeMapper.java @@ -17,6 +17,12 @@ package org.keycloak.broker.provider; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.models.KeycloakSession; @@ -24,12 +30,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/broker/provider/IdpLinkAction.java b/services/src/main/java/org/keycloak/broker/provider/IdpLinkAction.java index 8c91b2cfe6a..0f05b56a746 100644 --- a/services/src/main/java/org/keycloak/broker/provider/IdpLinkAction.java +++ b/services/src/main/java/org/keycloak/broker/provider/IdpLinkAction.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.util.Collections; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; + import org.keycloak.Config; import org.keycloak.authentication.InitiatedActionSupport; import org.keycloak.authentication.RequiredActionContext; @@ -50,6 +50,8 @@ import org.keycloak.services.resources.IdentityBrokerService; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.JsonSerialization; +import org.jboss.logging.Logger; + import static org.keycloak.services.resources.IdentityBrokerService.LINKING_IDENTITY_PROVIDER; /** diff --git a/services/src/main/java/org/keycloak/broker/saml/SAMLDataMarshaller.java b/services/src/main/java/org/keycloak/broker/saml/SAMLDataMarshaller.java index e78df0e6813..92f76b6f785 100644 --- a/services/src/main/java/org/keycloak/broker/saml/SAMLDataMarshaller.java +++ b/services/src/main/java/org/keycloak/broker/saml/SAMLDataMarshaller.java @@ -17,6 +17,10 @@ package org.keycloak.broker.saml; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; + import org.keycloak.broker.provider.DefaultDataMarshaller; import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; @@ -30,10 +34,6 @@ import org.keycloak.saml.processing.core.parsers.saml.SAMLParser; import org.keycloak.saml.processing.core.saml.v2.writers.SAMLAssertionWriter; import org.keycloak.saml.processing.core.saml.v2.writers.SAMLResponseWriter; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; - /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java b/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java index 8928a9e35af..e410e4bfb1a 100755 --- a/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java +++ b/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java @@ -17,14 +17,46 @@ package org.keycloak.broker.saml; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.io.IOException; +import java.net.URI; +import java.security.Key; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import javax.xml.crypto.dsig.XMLSignature; +import javax.xml.namespace.QName; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.IdentityBrokerException; import org.keycloak.broker.provider.UserAuthenticationIdentityProvider; import org.keycloak.common.ClientConnection; import org.keycloak.common.VerificationException; +import org.keycloak.crypto.KeyUse; import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.dom.saml.v2.assertion.AttributeType; @@ -42,6 +74,9 @@ import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; +import org.keycloak.keys.PublicKeyLoader; +import org.keycloak.keys.PublicKeyStorageProvider; +import org.keycloak.keys.PublicKeyStorageUtils; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.KeyManager; @@ -51,12 +86,17 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.LoginProtocol; import org.keycloak.protocol.LoginProtocolFactory; import org.keycloak.protocol.saml.JaxrsSAML2BindingBuilder; +import org.keycloak.protocol.saml.SAMLDecryptionKeysLocator; +import org.keycloak.protocol.saml.SamlMetadataKeyLocator; +import org.keycloak.protocol.saml.SamlMetadataPublicKeyLoader; +import org.keycloak.protocol.saml.SamlPrincipalType; import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.protocol.saml.SamlProtocolUtils; import org.keycloak.protocol.saml.SamlService; import org.keycloak.protocol.saml.SamlSessionUtils; import org.keycloak.protocol.saml.preprocessor.SamlAuthenticationPreprocessor; -import org.keycloak.protocol.saml.SAMLDecryptionKeysLocator; +import org.keycloak.rotation.HardcodedKeyLocator; +import org.keycloak.rotation.KeyLocator; import org.keycloak.saml.SAML2LogoutResponseBuilder; import org.keycloak.saml.SAMLRequestParser; import org.keycloak.saml.common.constants.GeneralConstants; @@ -69,68 +109,26 @@ import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.saml.processing.core.saml.v2.constants.X500SAMLProfileConstants; import org.keycloak.saml.processing.core.saml.v2.util.ArtifactResponseUtil; import org.keycloak.saml.processing.core.saml.v2.util.AssertionUtil; +import org.keycloak.saml.processing.core.util.KeycloakKeySamlExtensionGenerator; import org.keycloak.saml.processing.core.util.XMLEncryptionUtil; import org.keycloak.saml.processing.core.util.XMLSignatureUtil; import org.keycloak.saml.processing.web.util.PostBindingUtil; +import org.keycloak.saml.validators.ConditionsValidator; +import org.keycloak.saml.validators.DestinationValidator; import org.keycloak.services.ErrorPage; import org.keycloak.services.Urls; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.messages.Messages; - -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.FormParam; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; -import javax.xml.namespace.QName; -import java.io.IOException; -import java.security.Key; -import java.security.cert.X509Certificate; -import java.util.Collection; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import org.keycloak.crypto.KeyUse; -import org.keycloak.keys.PublicKeyLoader; -import org.keycloak.keys.PublicKeyStorageProvider; -import org.keycloak.keys.PublicKeyStorageUtils; -import org.keycloak.protocol.saml.SamlMetadataKeyLocator; -import org.keycloak.protocol.saml.SamlMetadataPublicKeyLoader; -import org.keycloak.protocol.saml.SamlPrincipalType; -import org.keycloak.rotation.HardcodedKeyLocator; -import org.keycloak.rotation.KeyLocator; -import org.keycloak.saml.processing.core.util.KeycloakKeySamlExtensionGenerator; -import org.keycloak.saml.validators.ConditionsValidator; -import org.keycloak.saml.validators.DestinationValidator; import org.keycloak.services.util.CacheControlUtil; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.Booleans; import org.keycloak.utils.StringUtil; + +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import java.net.URI; -import java.security.cert.CertificateException; - -import java.util.Collections; -import jakarta.ws.rs.core.MultivaluedMap; -import javax.xml.crypto.dsig.XMLSignature; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java b/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java index c74415eea7d..78addffd5bc 100755 --- a/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java +++ b/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProvider.java @@ -16,9 +16,27 @@ */ package org.keycloak.broker.saml; +import java.net.URI; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.stream.Collectors; +import javax.xml.parsers.ParserConfigurationException; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; import jakarta.xml.soap.SOAPException; import jakarta.xml.soap.SOAPMessage; -import org.jboss.logging.Logger; + import org.keycloak.broker.provider.AbstractIdentityProvider; import org.keycloak.broker.provider.AuthenticationRequest; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -56,13 +74,13 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.LoginProtocol; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.saml.JaxrsSAML2BindingBuilder; +import org.keycloak.protocol.saml.SAMLEncryptionAlgorithms; import org.keycloak.protocol.saml.SamlMetadataPublicKeyLoader; import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.protocol.saml.SamlService; import org.keycloak.protocol.saml.SamlSessionUtils; import org.keycloak.protocol.saml.mappers.SamlMetadataDescriptorUpdater; import org.keycloak.protocol.saml.preprocessor.SamlAuthenticationPreprocessor; -import org.keycloak.protocol.saml.SAMLEncryptionAlgorithms; import org.keycloak.protocol.saml.profile.util.Soap; import org.keycloak.saml.SAML2ArtifactResolveRequestBuilder; import org.keycloak.saml.SAML2AuthnRequestBuilder; @@ -87,27 +105,10 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.Booleans; import org.keycloak.util.JsonSerialization; +import org.jboss.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; -import javax.xml.parsers.ParserConfigurationException; -import java.net.URI; -import java.security.KeyPair; -import java.security.PrivateKey; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.stream.Collectors; - /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderConfig.java b/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderConfig.java index ea50fc02056..469bf03876b 100755 --- a/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderConfig.java +++ b/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderConfig.java @@ -16,8 +16,6 @@ */ package org.keycloak.broker.saml; -import static org.keycloak.common.util.UriUtils.checkUrl; - import org.keycloak.common.enums.SslRequired; import org.keycloak.dom.saml.v2.protocol.AuthnContextComparisonType; import org.keycloak.models.IdentityProviderModel; @@ -27,6 +25,8 @@ import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.common.util.XmlKeyInfoKeyNameTransformer; import org.keycloak.utils.StringUtil; +import static org.keycloak.common.util.UriUtils.checkUrl; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java b/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java index 2ae0f054063..798443865d3 100755 --- a/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/broker/saml/SAMLIdentityProviderFactory.java @@ -20,7 +20,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.xml.namespace.QName; import org.keycloak.Config.Scope; @@ -38,6 +37,7 @@ import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.processing.core.saml.v2.util.SAMLMetadataUtil; import org.keycloak.saml.validators.DestinationValidator; + import org.w3c.dom.Element; import static org.keycloak.models.IdentityProviderModel.LEGACY_HIDE_ON_LOGIN_ATTR; diff --git a/services/src/main/java/org/keycloak/broker/saml/mappers/AbstractAttributeToGroupMapper.java b/services/src/main/java/org/keycloak/broker/saml/mappers/AbstractAttributeToGroupMapper.java index ce9547af6d4..5e270fa5d69 100644 --- a/services/src/main/java/org/keycloak/broker/saml/mappers/AbstractAttributeToGroupMapper.java +++ b/services/src/main/java/org/keycloak/broker/saml/mappers/AbstractAttributeToGroupMapper.java @@ -16,7 +16,6 @@ */ package org.keycloak.broker.saml.mappers; -import org.jboss.logging.Logger; import org.keycloak.broker.provider.AbstractIdentityProviderMapper; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.ConfigConstants; @@ -27,6 +26,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; +import org.jboss.logging.Logger; + /** * Abstract class that handles the logic for importing and updating brokered users for all mappers that map a SAML * attribute into a {@code Keycloak} group. diff --git a/services/src/main/java/org/keycloak/broker/saml/mappers/AbstractAttributeToRoleMapper.java b/services/src/main/java/org/keycloak/broker/saml/mappers/AbstractAttributeToRoleMapper.java index 2e7bb6bfbae..874a90569e2 100644 --- a/services/src/main/java/org/keycloak/broker/saml/mappers/AbstractAttributeToRoleMapper.java +++ b/services/src/main/java/org/keycloak/broker/saml/mappers/AbstractAttributeToRoleMapper.java @@ -16,7 +16,6 @@ */ package org.keycloak.broker.saml.mappers; -import org.jboss.logging.Logger; import org.keycloak.broker.provider.AbstractIdentityProviderMapper; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.ConfigConstants; @@ -27,6 +26,8 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; +import org.jboss.logging.Logger; + /** * Abstract class that handles the logic for importing and updating brokered users for all mappers that map a SAML * attribute into a {@code Keycloak} role. diff --git a/services/src/main/java/org/keycloak/broker/saml/mappers/AdvancedAttributeToGroupMapper.java b/services/src/main/java/org/keycloak/broker/saml/mappers/AdvancedAttributeToGroupMapper.java index f75aeacf9ea..d133c9c5977 100644 --- a/services/src/main/java/org/keycloak/broker/saml/mappers/AdvancedAttributeToGroupMapper.java +++ b/services/src/main/java/org/keycloak/broker/saml/mappers/AdvancedAttributeToGroupMapper.java @@ -17,6 +17,14 @@ package org.keycloak.broker.saml.mappers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.broker.saml.SAMLEndpoint; @@ -27,14 +35,6 @@ import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import static org.keycloak.utils.RegexUtils.valueMatchesRegex; /** diff --git a/services/src/main/java/org/keycloak/broker/saml/mappers/AdvancedAttributeToRoleMapper.java b/services/src/main/java/org/keycloak/broker/saml/mappers/AdvancedAttributeToRoleMapper.java index a5354540ab7..b0db3b9c326 100644 --- a/services/src/main/java/org/keycloak/broker/saml/mappers/AdvancedAttributeToRoleMapper.java +++ b/services/src/main/java/org/keycloak/broker/saml/mappers/AdvancedAttributeToRoleMapper.java @@ -17,6 +17,14 @@ package org.keycloak.broker.saml.mappers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.broker.saml.SAMLEndpoint; @@ -27,14 +35,6 @@ import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; - import static org.keycloak.utils.RegexUtils.valueMatchesRegex; /** diff --git a/services/src/main/java/org/keycloak/broker/saml/mappers/AttributeToRoleMapper.java b/services/src/main/java/org/keycloak/broker/saml/mappers/AttributeToRoleMapper.java index 3735c76721c..b6c32edb926 100755 --- a/services/src/main/java/org/keycloak/broker/saml/mappers/AttributeToRoleMapper.java +++ b/services/src/main/java/org/keycloak/broker/saml/mappers/AttributeToRoleMapper.java @@ -17,6 +17,13 @@ package org.keycloak.broker.saml.mappers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; + import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.broker.saml.SAMLEndpoint; @@ -32,13 +39,6 @@ import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.protocol.saml.mappers.SamlMetadataDescriptorUpdater; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Optional; -import java.util.Set; - import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ATTRIBUTE_FORMAT_BASIC; /** diff --git a/services/src/main/java/org/keycloak/broker/saml/mappers/UserAttributeMapper.java b/services/src/main/java/org/keycloak/broker/saml/mappers/UserAttributeMapper.java index f3e2251373c..10f677dd401 100755 --- a/services/src/main/java/org/keycloak/broker/saml/mappers/UserAttributeMapper.java +++ b/services/src/main/java/org/keycloak/broker/saml/mappers/UserAttributeMapper.java @@ -17,6 +17,17 @@ package org.keycloak.broker.saml.mappers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import org.keycloak.broker.provider.AbstractIdentityProviderMapper; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.saml.SAMLEndpoint; @@ -38,17 +49,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.common.util.StringUtil; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.function.Supplier; -import java.util.stream.Collectors; - import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ATTRIBUTE_FORMAT_BASIC; /** diff --git a/services/src/main/java/org/keycloak/broker/saml/mappers/UsernameTemplateMapper.java b/services/src/main/java/org/keycloak/broker/saml/mappers/UsernameTemplateMapper.java index 0e79bea3699..566a5c13daf 100755 --- a/services/src/main/java/org/keycloak/broker/saml/mappers/UsernameTemplateMapper.java +++ b/services/src/main/java/org/keycloak/broker/saml/mappers/UsernameTemplateMapper.java @@ -17,6 +17,18 @@ package org.keycloak.broker.saml.mappers; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.function.UnaryOperator; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.keycloak.broker.provider.AbstractIdentityProviderMapper; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.saml.SAMLEndpoint; @@ -34,18 +46,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.function.UnaryOperator; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/broker/saml/mappers/XPathAttributeMapper.java b/services/src/main/java/org/keycloak/broker/saml/mappers/XPathAttributeMapper.java index 2c27067bf6f..80f8fc23efd 100644 --- a/services/src/main/java/org/keycloak/broker/saml/mappers/XPathAttributeMapper.java +++ b/services/src/main/java/org/keycloak/broker/saml/mappers/XPathAttributeMapper.java @@ -1,7 +1,5 @@ package org.keycloak.broker.saml.mappers; -import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ATTRIBUTE_FORMAT_BASIC; - import java.io.StringReader; import java.util.ArrayList; import java.util.Arrays; @@ -24,7 +22,7 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.jboss.logging.Logger; + import org.keycloak.broker.provider.AbstractIdentityProviderMapper; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.saml.SAMLEndpoint; @@ -44,8 +42,12 @@ import org.keycloak.protocol.saml.mappers.SamlMetadataDescriptorUpdater; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.common.util.StringUtil; + +import org.jboss.logging.Logger; import org.w3c.dom.Document; +import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ATTRIBUTE_FORMAT_BASIC; + public class XPathAttributeMapper extends AbstractIdentityProviderMapper implements SamlMetadataDescriptorUpdater { public static final String[] COMPATIBLE_PROVIDERS = {SAMLIdentityProviderFactory.PROVIDER_ID}; diff --git a/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProvider.java b/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProvider.java index ba705985be3..fc0ad95d251 100644 --- a/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProvider.java +++ b/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProvider.java @@ -1,6 +1,7 @@ package org.keycloak.broker.spiffe; -import org.jboss.logging.Logger; +import java.nio.charset.StandardCharsets; + import org.keycloak.authentication.ClientAuthenticationFlowContext; import org.keycloak.authentication.authenticators.client.AbstractJWTClientValidator; import org.keycloak.authentication.authenticators.client.FederatedJWTClientValidator; @@ -14,7 +15,7 @@ import org.keycloak.keys.PublicKeyStorageUtils; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.JsonWebToken; -import java.nio.charset.StandardCharsets; +import org.jboss.logging.Logger; /** * Implementation for https://datatracker.ietf.org/doc/draft-schwenkschuster-oauth-spiffe-client-auth/ diff --git a/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProviderConfig.java b/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProviderConfig.java index 39748d667e0..c579d194139 100644 --- a/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProviderConfig.java +++ b/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProviderConfig.java @@ -1,10 +1,10 @@ package org.keycloak.broker.spiffe; +import java.util.regex.Pattern; + import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.RealmModel; -import java.util.regex.Pattern; - import static org.keycloak.common.util.UriUtils.checkUrl; public class SpiffeIdentityProviderConfig extends IdentityProviderModel { diff --git a/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProviderFactory.java b/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProviderFactory.java index 6774153d3d8..e2b658f6f57 100644 --- a/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/broker/spiffe/SpiffeIdentityProviderFactory.java @@ -1,5 +1,7 @@ package org.keycloak.broker.spiffe; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.broker.provider.AbstractIdentityProviderFactory; import org.keycloak.common.Profile; @@ -7,8 +9,6 @@ import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.EnvironmentDependentProviderFactory; -import java.util.Map; - public class SpiffeIdentityProviderFactory extends AbstractIdentityProviderFactory implements EnvironmentDependentProviderFactory { public static final String PROVIDER_ID = "spiffe"; diff --git a/services/src/main/java/org/keycloak/broker/spiffe/SpiffeJSONWebKeySet.java b/services/src/main/java/org/keycloak/broker/spiffe/SpiffeJSONWebKeySet.java index 1fb28c89064..e82f1d31e82 100644 --- a/services/src/main/java/org/keycloak/broker/spiffe/SpiffeJSONWebKeySet.java +++ b/services/src/main/java/org/keycloak/broker/spiffe/SpiffeJSONWebKeySet.java @@ -1,8 +1,9 @@ package org.keycloak.broker.spiffe; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.jose.jwk.JSONWebKeySet; +import com.fasterxml.jackson.annotation.JsonProperty; + public class SpiffeJSONWebKeySet extends JSONWebKeySet { @JsonProperty("spiffe_refresh_hint") diff --git a/services/src/main/java/org/keycloak/cache/DefaultAlternativeLookupProvider.java b/services/src/main/java/org/keycloak/cache/DefaultAlternativeLookupProvider.java index d52710a4142..e12d2ad7740 100644 --- a/services/src/main/java/org/keycloak/cache/DefaultAlternativeLookupProvider.java +++ b/services/src/main/java/org/keycloak/cache/DefaultAlternativeLookupProvider.java @@ -1,14 +1,15 @@ package org.keycloak.cache; -import com.github.benmanes.caffeine.cache.Cache; -import org.keycloak.models.IdentityProviderQuery; -import org.keycloak.models.ClientModel; -import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.KeycloakSession; - import java.util.List; import java.util.Map; +import org.keycloak.models.ClientModel; +import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderQuery; +import org.keycloak.models.KeycloakSession; + +import com.github.benmanes.caffeine.cache.Cache; + public class DefaultAlternativeLookupProvider implements AlternativeLookupProvider { private final Cache lookupCache; diff --git a/services/src/main/java/org/keycloak/cache/DefaultAlternativeLookupProviderFactory.java b/services/src/main/java/org/keycloak/cache/DefaultAlternativeLookupProviderFactory.java index 4a820683d34..d2e989427e9 100644 --- a/services/src/main/java/org/keycloak/cache/DefaultAlternativeLookupProviderFactory.java +++ b/services/src/main/java/org/keycloak/cache/DefaultAlternativeLookupProviderFactory.java @@ -1,14 +1,15 @@ package org.keycloak.cache; +import java.util.concurrent.TimeUnit; + +import org.keycloak.Config; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; + import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.cache.CaffeineStatsCounter; -import org.keycloak.Config; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; - -import java.util.concurrent.TimeUnit; public class DefaultAlternativeLookupProviderFactory implements AlternativeLookupProviderFactory { diff --git a/services/src/main/java/org/keycloak/config/ConfigProviderFactory.java b/services/src/main/java/org/keycloak/config/ConfigProviderFactory.java index 78c3ffaca5a..85ffc0c1bbd 100644 --- a/services/src/main/java/org/keycloak/config/ConfigProviderFactory.java +++ b/services/src/main/java/org/keycloak/config/ConfigProviderFactory.java @@ -18,6 +18,7 @@ package org.keycloak.config; import java.util.Optional; + import org.keycloak.Config; public interface ConfigProviderFactory { diff --git a/services/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java b/services/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java index 98431a987cc..344e5ece72e 100755 --- a/services/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java +++ b/services/src/main/java/org/keycloak/connections/httpclient/DefaultHttpClientFactory.java @@ -17,16 +17,12 @@ package org.keycloak.connections.httpclient; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.entity.EntityBuilder; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.impl.client.AbstractResponseHandler; -import org.apache.http.impl.client.BasicResponseHandler; -import org.apache.http.impl.client.CloseableHttpClient; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.io.InputStream; +import java.security.KeyStore; +import java.util.List; +import java.util.concurrent.TimeUnit; + import org.keycloak.Config; import org.keycloak.common.util.EnvUtil; import org.keycloak.common.util.KeystoreUtil; @@ -36,14 +32,18 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.truststore.TruststoreProvider; -import java.io.IOException; -import java.io.InputStream; -import java.security.KeyStore; -import java.util.List; -import java.util.concurrent.TimeUnit; - +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; +import org.apache.http.client.entity.EntityBuilder; import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.impl.client.AbstractResponseHandler; +import org.apache.http.impl.client.BasicResponseHandler; +import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; +import org.jboss.logging.Logger; import static org.keycloak.utils.StringUtil.isBlank; diff --git a/services/src/main/java/org/keycloak/connections/httpclient/HttpClientBuilder.java b/services/src/main/java/org/keycloak/connections/httpclient/HttpClientBuilder.java index 98e03de52fe..39bb5f50853 100755 --- a/services/src/main/java/org/keycloak/connections/httpclient/HttpClientBuilder.java +++ b/services/src/main/java/org/keycloak/connections/httpclient/HttpClientBuilder.java @@ -17,6 +17,22 @@ package org.keycloak.connections.httpclient; +import java.security.KeyManagementException; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.security.UnrecoverableKeyException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; +import java.util.concurrent.TimeUnit; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; + +import org.keycloak.common.enums.HostnameVerificationPolicy; + import org.apache.http.client.config.RequestConfig; import org.apache.http.conn.ssl.BrowserCompatHostnameVerifier; import org.apache.http.conn.ssl.DefaultHostnameVerifier; @@ -28,21 +44,6 @@ import org.apache.http.impl.NoConnectionReuseStrategy; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContexts; -import org.keycloak.common.enums.HostnameVerificationPolicy; - -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.X509TrustManager; -import java.security.KeyManagementException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.SecureRandom; -import java.security.UnrecoverableKeyException; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; -import java.util.concurrent.TimeUnit; /** * Abstraction for creating HttpClients. Allows SSL configuration. diff --git a/services/src/main/java/org/keycloak/connections/httpclient/ProxyMappings.java b/services/src/main/java/org/keycloak/connections/httpclient/ProxyMappings.java index 4e2b46bcf45..3d900e7180d 100644 --- a/services/src/main/java/org/keycloak/connections/httpclient/ProxyMappings.java +++ b/services/src/main/java/org/keycloak/connections/httpclient/ProxyMappings.java @@ -16,10 +16,6 @@ */ package org.keycloak.connections.httpclient; -import org.apache.http.HttpHost; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.jboss.logging.Logger; - import java.net.URI; import java.util.ArrayList; import java.util.Arrays; @@ -31,6 +27,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.apache.http.HttpHost; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.jboss.logging.Logger; + import static org.keycloak.utils.StringUtil.isBlank; /** diff --git a/services/src/main/java/org/keycloak/connections/httpclient/SafeBasicResponseHandler.java b/services/src/main/java/org/keycloak/connections/httpclient/SafeBasicResponseHandler.java index d8bdf60c934..f69ba2cec06 100644 --- a/services/src/main/java/org/keycloak/connections/httpclient/SafeBasicResponseHandler.java +++ b/services/src/main/java/org/keycloak/connections/httpclient/SafeBasicResponseHandler.java @@ -17,11 +17,11 @@ package org.keycloak.connections.httpclient; +import java.io.IOException; + import org.apache.http.HttpEntity; import org.apache.http.impl.client.BasicResponseHandler; -import java.io.IOException; - /** * Limit the amount of data read to prevent a {@link OutOfMemoryError}. * diff --git a/services/src/main/java/org/keycloak/connections/httpclient/SafeHttpEntity.java b/services/src/main/java/org/keycloak/connections/httpclient/SafeHttpEntity.java index 1d1023d2987..edd4c98c2af 100644 --- a/services/src/main/java/org/keycloak/connections/httpclient/SafeHttpEntity.java +++ b/services/src/main/java/org/keycloak/connections/httpclient/SafeHttpEntity.java @@ -17,13 +17,13 @@ package org.keycloak.connections.httpclient; -import org.apache.http.Header; -import org.apache.http.HttpEntity; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import org.apache.http.Header; +import org.apache.http.HttpEntity; + /** * Limit the amount of data read to prevent a {@link OutOfMemoryError}. * diff --git a/services/src/main/java/org/keycloak/cookie/DefaultCookieProvider.java b/services/src/main/java/org/keycloak/cookie/DefaultCookieProvider.java index a09c89aa7a2..51b9ac24a5f 100644 --- a/services/src/main/java/org/keycloak/cookie/DefaultCookieProvider.java +++ b/services/src/main/java/org/keycloak/cookie/DefaultCookieProvider.java @@ -1,13 +1,15 @@ package org.keycloak.cookie; +import java.util.Map; + import jakarta.ws.rs.core.Cookie; import jakarta.ws.rs.core.NewCookie; -import org.jboss.logging.Logger; + import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; import org.keycloak.utils.SecureContextResolver; -import java.util.Map; +import org.jboss.logging.Logger; public class DefaultCookieProvider implements CookieProvider { diff --git a/services/src/main/java/org/keycloak/credential/AttestationStatementConverter.java b/services/src/main/java/org/keycloak/credential/AttestationStatementConverter.java index 750f6cc7446..53e347dca4f 100644 --- a/services/src/main/java/org/keycloak/credential/AttestationStatementConverter.java +++ b/services/src/main/java/org/keycloak/credential/AttestationStatementConverter.java @@ -16,10 +16,10 @@ package org.keycloak.credential; -import com.webauthn4j.converter.util.ObjectConverter; import org.keycloak.common.util.Base64Url; import com.webauthn4j.converter.util.CborConverter; +import com.webauthn4j.converter.util.ObjectConverter; import com.webauthn4j.data.attestation.statement.AttestationStatement; public class AttestationStatementConverter { diff --git a/services/src/main/java/org/keycloak/credential/CredentialPublicKeyConverter.java b/services/src/main/java/org/keycloak/credential/CredentialPublicKeyConverter.java index d87a54b7e55..d4f761ca3c1 100644 --- a/services/src/main/java/org/keycloak/credential/CredentialPublicKeyConverter.java +++ b/services/src/main/java/org/keycloak/credential/CredentialPublicKeyConverter.java @@ -16,10 +16,10 @@ package org.keycloak.credential; -import com.webauthn4j.converter.util.ObjectConverter; import org.keycloak.common.util.Base64Url; import com.webauthn4j.converter.util.CborConverter; +import com.webauthn4j.converter.util.ObjectConverter; import com.webauthn4j.data.attestation.authenticator.COSEKey; public class CredentialPublicKeyConverter { diff --git a/services/src/main/java/org/keycloak/credential/OTPCredentialProvider.java b/services/src/main/java/org/keycloak/credential/OTPCredentialProvider.java index be34460db0e..501b99f584b 100644 --- a/services/src/main/java/org/keycloak/credential/OTPCredentialProvider.java +++ b/services/src/main/java/org/keycloak/credential/OTPCredentialProvider.java @@ -18,7 +18,6 @@ package org.keycloak.credential; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.common.util.ObjectUtil; import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; @@ -33,6 +32,8 @@ import org.keycloak.models.credential.dto.OTPSecretData; import org.keycloak.models.utils.HmacOTP; import org.keycloak.models.utils.TimeBasedOTP; +import org.jboss.logging.Logger; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/credential/PasswordCredentialProvider.java b/services/src/main/java/org/keycloak/credential/PasswordCredentialProvider.java index baa00d831b3..161ac1afa34 100644 --- a/services/src/main/java/org/keycloak/credential/PasswordCredentialProvider.java +++ b/services/src/main/java/org/keycloak/credential/PasswordCredentialProvider.java @@ -16,10 +16,12 @@ */ package org.keycloak.credential; -import io.micrometer.core.instrument.Counter; -import io.micrometer.core.instrument.Meter; -import io.micrometer.core.instrument.Tag; -import org.jboss.logging.Logger; +import java.time.Duration; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.common.util.Time; import org.keycloak.credential.hash.PasswordHashProvider; import org.keycloak.models.AbstractKeycloakTransaction; @@ -34,11 +36,10 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.policy.PasswordPolicyManagerProvider; import org.keycloak.policy.PolicyError; -import java.time.Duration; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import io.micrometer.core.instrument.Counter; +import io.micrometer.core.instrument.Meter; +import io.micrometer.core.instrument.Tag; +import org.jboss.logging.Logger; import static org.keycloak.credential.PasswordCredentialProviderFactory.METER_ALGORITHM_TAG; import static org.keycloak.credential.PasswordCredentialProviderFactory.METER_HASHING_STRENGTH_TAG; diff --git a/services/src/main/java/org/keycloak/credential/PasswordCredentialProviderFactory.java b/services/src/main/java/org/keycloak/credential/PasswordCredentialProviderFactory.java index 12fdbed301e..c41d17cf195 100644 --- a/services/src/main/java/org/keycloak/credential/PasswordCredentialProviderFactory.java +++ b/services/src/main/java/org/keycloak/credential/PasswordCredentialProviderFactory.java @@ -16,19 +16,20 @@ */ package org.keycloak.credential; -import io.micrometer.core.instrument.Counter; -import io.micrometer.core.instrument.Meter; -import io.micrometer.core.instrument.Metrics; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.Config; import org.keycloak.config.MetricsOptions; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.Arrays; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; +import io.micrometer.core.instrument.Counter; +import io.micrometer.core.instrument.Meter; +import io.micrometer.core.instrument.Metrics; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/credential/RecoveryAuthnCodesCredentialProvider.java b/services/src/main/java/org/keycloak/credential/RecoveryAuthnCodesCredentialProvider.java index ae120d10f1e..3a256e0d63f 100644 --- a/services/src/main/java/org/keycloak/credential/RecoveryAuthnCodesCredentialProvider.java +++ b/services/src/main/java/org/keycloak/credential/RecoveryAuthnCodesCredentialProvider.java @@ -1,6 +1,9 @@ package org.keycloak.credential; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.util.Objects; +import java.util.Optional; + import org.keycloak.authentication.requiredactions.RecoveryAuthnCodesAction; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -13,9 +16,7 @@ import org.keycloak.models.utils.RecoveryAuthnCodesUtils; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.RequiredActionHelper; -import java.io.IOException; -import java.util.Objects; -import java.util.Optional; +import org.jboss.logging.Logger; import static org.keycloak.models.credential.RecoveryAuthnCodesCredentialModel.RECOVERY_CODES_GENERATE_NEW_CODES; import static org.keycloak.models.credential.RecoveryAuthnCodesCredentialModel.RECOVERY_CODES_NUMBER_REMAINING; diff --git a/services/src/main/java/org/keycloak/credential/WebAuthnCredentialModelInput.java b/services/src/main/java/org/keycloak/credential/WebAuthnCredentialModelInput.java index c280468dff4..23ebf0c5e67 100644 --- a/services/src/main/java/org/keycloak/credential/WebAuthnCredentialModelInput.java +++ b/services/src/main/java/org/keycloak/credential/WebAuthnCredentialModelInput.java @@ -16,19 +16,19 @@ package org.keycloak.credential; -import com.webauthn4j.server.ServerProperty; +import java.util.Base64; +import java.util.Collections; +import java.util.Set; +import java.util.stream.Collectors; + +import org.keycloak.common.util.CollectionUtil; import com.webauthn4j.data.AuthenticationRequest; import com.webauthn4j.data.AuthenticatorTransport; import com.webauthn4j.data.attestation.authenticator.AttestedCredentialData; import com.webauthn4j.data.attestation.authenticator.COSEKey; import com.webauthn4j.data.attestation.statement.AttestationStatement; -import org.keycloak.common.util.CollectionUtil; - -import java.util.Base64; -import java.util.Collections; -import java.util.Set; -import java.util.stream.Collectors; +import com.webauthn4j.server.ServerProperty; public class WebAuthnCredentialModelInput implements CredentialInput { diff --git a/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProvider.java b/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProvider.java index e3347124d03..adce68358df 100644 --- a/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProvider.java +++ b/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProvider.java @@ -16,6 +16,28 @@ package org.keycloak.credential; +import java.io.IOException; +import java.util.Arrays; +import java.util.Base64; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import jakarta.annotation.Nonnull; + +import org.keycloak.authentication.authenticators.browser.WebAuthnMetadataService; +import org.keycloak.authentication.requiredactions.WebAuthnRegisterFactory; +import org.keycloak.common.util.Time; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.models.UserModel; +import org.keycloak.models.WebAuthnPolicy; +import org.keycloak.models.credential.WebAuthnCredentialModel; +import org.keycloak.models.credential.dto.WebAuthnCredentialData; +import org.keycloak.models.credential.dto.WebAuthnCredentialPresentationData; +import org.keycloak.util.JsonSerialization; + import com.webauthn4j.WebAuthnAuthenticationManager; import com.webauthn4j.authenticator.Authenticator; import com.webauthn4j.authenticator.AuthenticatorImpl; @@ -33,27 +55,7 @@ import com.webauthn4j.util.AssertUtil; import com.webauthn4j.util.exception.WebAuthnException; import com.webauthn4j.verifier.OriginVerifierImpl; import com.webauthn4j.verifier.exception.BadOriginException; -import jakarta.annotation.Nonnull; import org.jboss.logging.Logger; -import org.keycloak.authentication.authenticators.browser.WebAuthnMetadataService; -import org.keycloak.authentication.requiredactions.WebAuthnRegisterFactory; -import org.keycloak.common.util.Time; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.models.UserModel; -import org.keycloak.models.WebAuthnPolicy; -import org.keycloak.models.credential.WebAuthnCredentialModel; -import org.keycloak.models.credential.dto.WebAuthnCredentialData; -import org.keycloak.models.credential.dto.WebAuthnCredentialPresentationData; -import org.keycloak.util.JsonSerialization; - -import java.io.IOException; -import java.util.Arrays; -import java.util.Base64; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; /** * Credential provider for WebAuthn 2-factor credential of the user diff --git a/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProviderFactory.java b/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProviderFactory.java index d83fe79ee91..791356e0496 100644 --- a/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProviderFactory.java +++ b/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProviderFactory.java @@ -16,13 +16,14 @@ package org.keycloak.credential; -import com.webauthn4j.converter.util.ObjectConverter; import org.keycloak.Config; import org.keycloak.authentication.authenticators.browser.WebAuthnMetadataService; import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.EnvironmentDependentProviderFactory; +import com.webauthn4j.converter.util.ObjectConverter; + public class WebAuthnCredentialProviderFactory implements CredentialProviderFactory, EnvironmentDependentProviderFactory { public static final String PROVIDER_ID = "keycloak-webauthn"; diff --git a/services/src/main/java/org/keycloak/credential/WebAuthnPasswordlessCredentialProvider.java b/services/src/main/java/org/keycloak/credential/WebAuthnPasswordlessCredentialProvider.java index 30e00f65047..87f0bad067a 100644 --- a/services/src/main/java/org/keycloak/credential/WebAuthnPasswordlessCredentialProvider.java +++ b/services/src/main/java/org/keycloak/credential/WebAuthnPasswordlessCredentialProvider.java @@ -18,13 +18,14 @@ package org.keycloak.credential; -import com.webauthn4j.converter.util.ObjectConverter; import org.keycloak.authentication.authenticators.browser.WebAuthnMetadataService; import org.keycloak.authentication.requiredactions.WebAuthnPasswordlessRegisterFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.WebAuthnPolicy; import org.keycloak.models.credential.WebAuthnCredentialModel; +import com.webauthn4j.converter.util.ObjectConverter; + /** * Credential provider for WebAuthn passwordless credential of the user * diff --git a/services/src/main/java/org/keycloak/crypto/ClientMacSignatureVerifierContext.java b/services/src/main/java/org/keycloak/crypto/ClientMacSignatureVerifierContext.java index b14c82b4968..733ebeb6346 100644 --- a/services/src/main/java/org/keycloak/crypto/ClientMacSignatureVerifierContext.java +++ b/services/src/main/java/org/keycloak/crypto/ClientMacSignatureVerifierContext.java @@ -17,7 +17,6 @@ package org.keycloak.crypto; import java.nio.charset.StandardCharsets; - import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; diff --git a/services/src/main/java/org/keycloak/crypto/CryptoUtils.java b/services/src/main/java/org/keycloak/crypto/CryptoUtils.java index 6b81ab77b47..5a1595a7b33 100644 --- a/services/src/main/java/org/keycloak/crypto/CryptoUtils.java +++ b/services/src/main/java/org/keycloak/crypto/CryptoUtils.java @@ -17,9 +17,6 @@ package org.keycloak.crypto; -import org.keycloak.models.KeycloakSession; -import org.keycloak.provider.ProviderFactory; - import java.security.Key; import java.security.PrivateKey; import java.security.PublicKey; @@ -28,6 +25,9 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.keycloak.models.KeycloakSession; +import org.keycloak.provider.ProviderFactory; + /** * Utility class for common cryptographic operations and algorithm discovery. * diff --git a/services/src/main/java/org/keycloak/device/DeviceRepresentationProviderFactoryImpl.java b/services/src/main/java/org/keycloak/device/DeviceRepresentationProviderFactoryImpl.java index d108ae883c0..5a2323e377d 100644 --- a/services/src/main/java/org/keycloak/device/DeviceRepresentationProviderFactoryImpl.java +++ b/services/src/main/java/org/keycloak/device/DeviceRepresentationProviderFactoryImpl.java @@ -2,14 +2,15 @@ package org.keycloak.device; import java.util.List; +import org.keycloak.Config; +import org.keycloak.models.KeycloakSession; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.provider.ProviderConfigurationBuilder; + import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.cache.CaffeineStatsCounter; -import org.keycloak.Config; -import org.keycloak.models.KeycloakSession; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.provider.ProviderConfigurationBuilder; import ua_parser.Client; import ua_parser.Parser; diff --git a/services/src/main/java/org/keycloak/device/DeviceRepresentationProviderImpl.java b/services/src/main/java/org/keycloak/device/DeviceRepresentationProviderImpl.java index 22d2b1b5202..3a29fc99a54 100644 --- a/services/src/main/java/org/keycloak/device/DeviceRepresentationProviderImpl.java +++ b/services/src/main/java/org/keycloak/device/DeviceRepresentationProviderImpl.java @@ -1,11 +1,13 @@ package org.keycloak.device; -import com.github.benmanes.caffeine.cache.LoadingCache; import jakarta.ws.rs.core.HttpHeaders; -import org.jboss.logging.Logger; + import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.account.DeviceRepresentation; + +import com.github.benmanes.caffeine.cache.LoadingCache; +import org.jboss.logging.Logger; import ua_parser.Client; public class DeviceRepresentationProviderImpl implements DeviceRepresentationProvider { diff --git a/services/src/main/java/org/keycloak/email/DefaultEmailAuthenticator.java b/services/src/main/java/org/keycloak/email/DefaultEmailAuthenticator.java index 4392dd13265..bc3425a6a84 100644 --- a/services/src/main/java/org/keycloak/email/DefaultEmailAuthenticator.java +++ b/services/src/main/java/org/keycloak/email/DefaultEmailAuthenticator.java @@ -1,10 +1,11 @@ package org.keycloak.email; +import java.util.Map; + import jakarta.mail.MessagingException; import jakarta.mail.Transport; -import org.keycloak.models.KeycloakSession; -import java.util.Map; +import org.keycloak.models.KeycloakSession; public class DefaultEmailAuthenticator implements EmailAuthenticator { diff --git a/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java b/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java index 966f1ae4c5e..6880bfe4c19 100644 --- a/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java +++ b/services/src/main/java/org/keycloak/email/DefaultEmailSenderProvider.java @@ -17,7 +17,27 @@ package org.keycloak.email; -import org.jboss.logging.Logger; +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; +import java.util.Date; +import java.util.Map; +import java.util.Properties; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSocketFactory; + +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.Multipart; +import jakarta.mail.Session; +import jakarta.mail.Transport; +import jakarta.mail.internet.AddressException; +import jakarta.mail.internet.InternetAddress; +import jakarta.mail.internet.MimeBodyPart; +import jakarta.mail.internet.MimeMessage; +import jakarta.mail.internet.MimeMultipart; +import jakarta.mail.internet.MimeUtility; + import org.keycloak.common.enums.HostnameVerificationPolicy; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; @@ -26,25 +46,7 @@ import org.keycloak.truststore.JSSETruststoreConfigurator; import org.keycloak.utils.EmailValidationUtil; import org.keycloak.utils.SMTPUtil; -import jakarta.mail.Address; -import jakarta.mail.MessagingException; -import jakarta.mail.Multipart; -import jakarta.mail.Session; -import jakarta.mail.Message; -import jakarta.mail.Transport; -import jakarta.mail.internet.AddressException; -import jakarta.mail.internet.InternetAddress; -import jakarta.mail.internet.MimeBodyPart; -import jakarta.mail.internet.MimeMultipart; -import jakarta.mail.internet.MimeMessage; -import jakarta.mail.internet.MimeUtility; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocketFactory; -import java.io.UnsupportedEncodingException; -import java.nio.charset.StandardCharsets; -import java.util.Date; -import java.util.Map; -import java.util.Properties; +import org.jboss.logging.Logger; import static org.keycloak.utils.StringUtil.isNotBlank; diff --git a/services/src/main/java/org/keycloak/email/DefaultEmailSenderProviderFactory.java b/services/src/main/java/org/keycloak/email/DefaultEmailSenderProviderFactory.java index cad3f41ec43..6bc7311daef 100644 --- a/services/src/main/java/org/keycloak/email/DefaultEmailSenderProviderFactory.java +++ b/services/src/main/java/org/keycloak/email/DefaultEmailSenderProviderFactory.java @@ -17,13 +17,13 @@ package org.keycloak.email; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/email/EmailAuthenticator.java b/services/src/main/java/org/keycloak/email/EmailAuthenticator.java index 80892995130..34b11c71d90 100644 --- a/services/src/main/java/org/keycloak/email/EmailAuthenticator.java +++ b/services/src/main/java/org/keycloak/email/EmailAuthenticator.java @@ -1,10 +1,11 @@ package org.keycloak.email; -import jakarta.mail.Transport; -import org.keycloak.models.KeycloakSession; - import java.util.Map; +import jakarta.mail.Transport; + +import org.keycloak.models.KeycloakSession; + public interface EmailAuthenticator { void connect(KeycloakSession session, Map config, Transport transport) throws EmailException; @@ -15,5 +16,3 @@ public interface EmailAuthenticator { TOKEN } } - - diff --git a/services/src/main/java/org/keycloak/email/PasswordAuthEmailAuthenticator.java b/services/src/main/java/org/keycloak/email/PasswordAuthEmailAuthenticator.java index 634841a7cc1..a22f46c3010 100644 --- a/services/src/main/java/org/keycloak/email/PasswordAuthEmailAuthenticator.java +++ b/services/src/main/java/org/keycloak/email/PasswordAuthEmailAuthenticator.java @@ -1,12 +1,13 @@ package org.keycloak.email; +import java.util.Map; + import jakarta.mail.MessagingException; import jakarta.mail.Transport; + import org.keycloak.models.KeycloakSession; import org.keycloak.vault.VaultStringSecret; -import java.util.Map; - public class PasswordAuthEmailAuthenticator implements EmailAuthenticator { @Override diff --git a/services/src/main/java/org/keycloak/email/TokenAuthEmailAuthenticator.java b/services/src/main/java/org/keycloak/email/TokenAuthEmailAuthenticator.java index 1e7c52bb47e..3525eda5e35 100644 --- a/services/src/main/java/org/keycloak/email/TokenAuthEmailAuthenticator.java +++ b/services/src/main/java/org/keycloak/email/TokenAuthEmailAuthenticator.java @@ -1,21 +1,23 @@ package org.keycloak.email; -import com.fasterxml.jackson.databind.JsonNode; -import jakarta.mail.AuthenticationFailedException; -import jakarta.mail.MessagingException; -import jakarta.mail.Transport; -import org.jboss.logging.Logger; -import org.keycloak.http.simple.SimpleHttp; -import org.keycloak.models.KeycloakSession; -import org.keycloak.utils.KeycloakSessionUtil; -import org.keycloak.vault.VaultStringSecret; - import java.io.IOException; import java.time.LocalDateTime; import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; +import jakarta.mail.AuthenticationFailedException; +import jakarta.mail.MessagingException; +import jakarta.mail.Transport; + +import org.keycloak.http.simple.SimpleHttp; +import org.keycloak.models.KeycloakSession; +import org.keycloak.utils.KeycloakSessionUtil; +import org.keycloak.vault.VaultStringSecret; + +import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; + public class TokenAuthEmailAuthenticator implements EmailAuthenticator { private static final Logger logger = Logger.getLogger(TokenAuthEmailAuthenticator.class); diff --git a/services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java b/services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java index 66207a4d7ba..8adc05a796e 100755 --- a/services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java +++ b/services/src/main/java/org/keycloak/email/freemarker/FreeMarkerEmailTemplateProvider.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.Properties; import jakarta.enterprise.context.ContextNotActiveException; + import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.common.util.ObjectUtil; import org.keycloak.email.EmailException; @@ -50,6 +51,7 @@ import org.keycloak.theme.Theme; import org.keycloak.theme.beans.LinkExpirationFormatterMethod; import org.keycloak.theme.beans.MessageFormatterMethod; import org.keycloak.theme.freemarker.FreeMarkerProvider; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/services/src/main/java/org/keycloak/email/freemarker/beans/AdminEventBean.java b/services/src/main/java/org/keycloak/email/freemarker/beans/AdminEventBean.java index cb21dabae8b..1ae328a25c4 100644 --- a/services/src/main/java/org/keycloak/email/freemarker/beans/AdminEventBean.java +++ b/services/src/main/java/org/keycloak/email/freemarker/beans/AdminEventBean.java @@ -17,10 +17,10 @@ package org.keycloak.email.freemarker.beans; -import org.keycloak.events.admin.AdminEvent; - import java.util.Date; +import org.keycloak.events.admin.AdminEvent; + /** * @author Giriraj Sharma */ diff --git a/services/src/main/java/org/keycloak/email/freemarker/beans/EventBean.java b/services/src/main/java/org/keycloak/email/freemarker/beans/EventBean.java index a57581f34ec..5158e891e1a 100644 --- a/services/src/main/java/org/keycloak/email/freemarker/beans/EventBean.java +++ b/services/src/main/java/org/keycloak/email/freemarker/beans/EventBean.java @@ -17,13 +17,13 @@ package org.keycloak.email.freemarker.beans; -import org.keycloak.events.Event; - import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.keycloak.events.Event; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java b/services/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java index bd473791413..b47fcb468d2 100755 --- a/services/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java +++ b/services/src/main/java/org/keycloak/email/freemarker/beans/ProfileBean.java @@ -16,7 +16,11 @@ */ package org.keycloak.email.freemarker.beans; -import org.jboss.logging.Logger; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.forms.login.freemarker.model.OrganizationBean; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; @@ -25,10 +29,7 @@ import org.keycloak.representations.userprofile.config.UPAttribute; import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.userprofile.UserProfileProvider; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/encoding/GzipResourceEncodingProvider.java b/services/src/main/java/org/keycloak/encoding/GzipResourceEncodingProvider.java index 763c6c1faec..e6e77c03f4d 100644 --- a/services/src/main/java/org/keycloak/encoding/GzipResourceEncodingProvider.java +++ b/services/src/main/java/org/keycloak/encoding/GzipResourceEncodingProvider.java @@ -1,9 +1,5 @@ package org.keycloak.encoding; -import org.apache.commons.io.IOUtils; -import org.jboss.logging.Logger; -import org.keycloak.theme.ResourceLoader; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -12,6 +8,11 @@ import java.io.InputStream; import java.nio.file.Files; import java.util.zip.GZIPOutputStream; +import org.keycloak.theme.ResourceLoader; + +import org.apache.commons.io.IOUtils; +import org.jboss.logging.Logger; + import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; public class GzipResourceEncodingProvider implements ResourceEncodingProvider { diff --git a/services/src/main/java/org/keycloak/encoding/GzipResourceEncodingProviderFactory.java b/services/src/main/java/org/keycloak/encoding/GzipResourceEncodingProviderFactory.java index efe130eb2a5..05e251a9ce6 100644 --- a/services/src/main/java/org/keycloak/encoding/GzipResourceEncodingProviderFactory.java +++ b/services/src/main/java/org/keycloak/encoding/GzipResourceEncodingProviderFactory.java @@ -1,14 +1,5 @@ package org.keycloak.encoding; -import org.apache.commons.io.FileUtils; -import org.jboss.logging.Logger; -import org.keycloak.Config; -import org.keycloak.common.Version; -import org.keycloak.models.KeycloakSession; -import org.keycloak.platform.Platform; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.provider.ProviderConfigurationBuilder; - import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -16,6 +7,16 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.keycloak.Config; +import org.keycloak.common.Version; +import org.keycloak.models.KeycloakSession; +import org.keycloak.platform.Platform; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.provider.ProviderConfigurationBuilder; + +import org.apache.commons.io.FileUtils; +import org.jboss.logging.Logger; + public class GzipResourceEncodingProviderFactory implements ResourceEncodingProviderFactory { private static final Logger logger = Logger.getLogger(GzipResourceEncodingProviderFactory.class); diff --git a/services/src/main/java/org/keycloak/encoding/ResourceEncodingProvider.java b/services/src/main/java/org/keycloak/encoding/ResourceEncodingProvider.java index fdf224782c6..278c1c32a74 100644 --- a/services/src/main/java/org/keycloak/encoding/ResourceEncodingProvider.java +++ b/services/src/main/java/org/keycloak/encoding/ResourceEncodingProvider.java @@ -1,10 +1,10 @@ package org.keycloak.encoding; -import org.keycloak.provider.Provider; - import java.io.IOException; import java.io.InputStream; +import org.keycloak.provider.Provider; + public interface ResourceEncodingProvider extends Provider { InputStream getEncodedStream(StreamSupplier producer, String... path); diff --git a/services/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java b/services/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java index 97d1c190e2e..80019a0108e 100755 --- a/services/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java +++ b/services/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java @@ -17,9 +17,8 @@ package org.keycloak.events.email; -import static org.keycloak.models.utils.KeycloakModelUtils.runJobInTransaction; +import java.util.Set; -import org.jboss.logging.Logger; import org.keycloak.email.EmailException; import org.keycloak.email.EmailTemplateProvider; import org.keycloak.events.Event; @@ -37,7 +36,9 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RealmProvider; import org.keycloak.models.UserModel; -import java.util.Set; +import org.jboss.logging.Logger; + +import static org.keycloak.models.utils.KeycloakModelUtils.runJobInTransaction; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java b/services/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java index 642310edf74..1df01f20c10 100755 --- a/services/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java +++ b/services/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java @@ -17,6 +17,13 @@ package org.keycloak.events.email; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.keycloak.Config; import org.keycloak.events.EventListenerProvider; import org.keycloak.events.EventListenerProviderFactory; @@ -26,13 +33,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java b/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java index 362ff92ba13..72af4c482d7 100755 --- a/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java +++ b/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java @@ -17,7 +17,12 @@ package org.keycloak.events.log; -import org.jboss.logging.Logger; +import java.util.Map; + +import jakarta.ws.rs.core.Cookie; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.util.StackUtil; import org.keycloak.events.Event; import org.keycloak.events.EventListenerProvider; @@ -28,10 +33,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.utils.StringUtil; -import jakarta.ws.rs.core.Cookie; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.UriInfo; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java b/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java index eaa900ddfbd..c910a0d59b3 100755 --- a/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java +++ b/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java @@ -20,7 +20,7 @@ package org.keycloak.events.log; import java.util.Arrays; import java.util.Comparator; import java.util.List; -import org.jboss.logging.Logger; + import org.keycloak.Config; import org.keycloak.events.EventListenerProvider; import org.keycloak.events.EventListenerProviderFactory; @@ -29,6 +29,8 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/executors/DefaultExecutorsProviderFactory.java b/services/src/main/java/org/keycloak/executors/DefaultExecutorsProviderFactory.java index 207a93ff355..ffceb3f74d6 100644 --- a/services/src/main/java/org/keycloak/executors/DefaultExecutorsProviderFactory.java +++ b/services/src/main/java/org/keycloak/executors/DefaultExecutorsProviderFactory.java @@ -27,16 +27,16 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; - import javax.naming.InitialContext; import javax.naming.NameNotFoundException; import javax.naming.NamingException; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/exportimport/ExportImportManager.java b/services/src/main/java/org/keycloak/exportimport/ExportImportManager.java index 3a3a68e3723..7ad26011c6a 100644 --- a/services/src/main/java/org/keycloak/exportimport/ExportImportManager.java +++ b/services/src/main/java/org/keycloak/exportimport/ExportImportManager.java @@ -17,12 +17,6 @@ package org.keycloak.exportimport; -import org.jboss.logging.Logger; -import org.keycloak.Config; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.provider.ProviderFactory; - import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -35,6 +29,13 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Stream; +import org.keycloak.Config; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.provider.ProviderFactory; + +import org.jboss.logging.Logger; + import static org.keycloak.exportimport.ExportImportConfig.PROVIDER; import static org.keycloak.exportimport.ExportImportConfig.PROVIDER_DEFAULT; diff --git a/services/src/main/java/org/keycloak/exportimport/KeycloakClientDescriptionConverter.java b/services/src/main/java/org/keycloak/exportimport/KeycloakClientDescriptionConverter.java index 819ecbedd17..393d8633277 100755 --- a/services/src/main/java/org/keycloak/exportimport/KeycloakClientDescriptionConverter.java +++ b/services/src/main/java/org/keycloak/exportimport/KeycloakClientDescriptionConverter.java @@ -17,14 +17,14 @@ package org.keycloak.exportimport; +import java.io.IOException; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.IOException; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/AuthenticatorConfiguredMethod.java b/services/src/main/java/org/keycloak/forms/login/freemarker/AuthenticatorConfiguredMethod.java index faa51e4bd67..9c61d573f13 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/AuthenticatorConfiguredMethod.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/AuthenticatorConfiguredMethod.java @@ -17,14 +17,15 @@ package org.keycloak.forms.login.freemarker; -import freemarker.template.TemplateMethodModelEx; -import freemarker.template.TemplateModelException; +import java.util.List; + import org.keycloak.authentication.Authenticator; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import java.util.List; +import freemarker.template.TemplateMethodModelEx; +import freemarker.template.TemplateModelException; /** */ diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/DetachedInfoStateChecker.java b/services/src/main/java/org/keycloak/forms/login/freemarker/DetachedInfoStateChecker.java index 5029c523cdc..01bf06e7198 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/DetachedInfoStateChecker.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/DetachedInfoStateChecker.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; + import org.keycloak.common.VerificationException; import org.keycloak.cookie.CookieProvider; import org.keycloak.cookie.CookieType; @@ -32,6 +32,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/DetachedInfoStateCookie.java b/services/src/main/java/org/keycloak/forms/login/freemarker/DetachedInfoStateCookie.java index c577067e398..87f28453283 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/DetachedInfoStateCookie.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/DetachedInfoStateCookie.java @@ -21,10 +21,11 @@ package org.keycloak.forms.login.freemarker; import java.util.List; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.Token; import org.keycloak.TokenCategory; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Cookie encapsulating data to be displayed on the info/error page. We need this data due the fact that authenticationSession may not exists. * This is needed so the info/error page can be restored after user changed language. diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java b/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java index 5fa9e9abeae..943db08ec4c 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/FreeMarkerLoginFormsProvider.java @@ -16,12 +16,26 @@ */ package org.keycloak.forms.login.freemarker; +import java.io.IOException; +import java.net.URI; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Properties; +import java.util.function.Function; + import jakarta.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationProcessor; @@ -91,19 +105,7 @@ import org.keycloak.userprofile.UserProfileContext; import org.keycloak.utils.MediaType; import org.keycloak.utils.MediaTypeMatcher; -import java.io.IOException; -import java.net.URI; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Properties; -import java.util.function.Function; +import org.jboss.logging.Logger; import static org.keycloak.models.UserModel.RequiredAction.UPDATE_PASSWORD; import static org.keycloak.organization.utils.Organizations.resolveOrganization; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/AuthenticationSessionBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/AuthenticationSessionBean.java index 0fbcb324fed..51063fc6a6f 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/AuthenticationSessionBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/AuthenticationSessionBean.java @@ -19,12 +19,12 @@ package org.keycloak.forms.login.freemarker.model; -import org.keycloak.crypto.JavaAlgorithm; -import org.keycloak.jose.jws.crypto.HashUtils; - import java.nio.charset.StandardCharsets; import java.util.Base64; +import org.keycloak.crypto.JavaAlgorithm; +import org.keycloak.jose.jws.crypto.HashUtils; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/ClientBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/ClientBean.java index f8d239d6357..03e934ae7d7 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/ClientBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/ClientBean.java @@ -17,12 +17,12 @@ package org.keycloak.forms.login.freemarker.model; +import java.util.Map; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.services.util.ResolveRelative; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/EmailBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/EmailBean.java index 08b249fef3b..f6af5c02cd5 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/EmailBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/EmailBean.java @@ -19,6 +19,7 @@ package org.keycloak.forms.login.freemarker.model; import java.util.stream.Stream; import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; import org.keycloak.userprofile.UserProfile; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/FrontChannelLogoutBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/FrontChannelLogoutBean.java index 6c775326f91..b97dc85fd3b 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/FrontChannelLogoutBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/FrontChannelLogoutBean.java @@ -1,6 +1,7 @@ package org.keycloak.forms.login.freemarker.model; import java.util.List; + import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.FrontChannelLogoutHandler; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/IdentityProviderBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/IdentityProviderBean.java index e77ae48ddf3..c8319fa3d8b 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/IdentityProviderBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/IdentityProviderBean.java @@ -16,24 +16,6 @@ */ package org.keycloak.forms.login.freemarker.model; -import org.keycloak.authentication.AuthenticationFlowContext; -import org.keycloak.authentication.AuthenticationProcessor; -import org.keycloak.authentication.authenticators.broker.AbstractIdpAuthenticator; -import org.keycloak.authentication.authenticators.broker.util.SerializedBrokeredIdentityContext; -import org.keycloak.common.Profile; -import org.keycloak.models.FederatedIdentityModel; -import org.keycloak.models.IdentityProviderStorageProvider; -import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.OrderedModel; -import org.keycloak.models.RealmModel; -import org.keycloak.models.UserModel; -import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.services.Urls; -import org.keycloak.services.resources.LoginActionsService; -import org.keycloak.sessions.AuthenticationSessionModel; -import org.keycloak.theme.Theme; - import java.io.IOException; import java.net.URI; import java.util.HashSet; @@ -46,6 +28,24 @@ import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; +import org.keycloak.authentication.AuthenticationFlowContext; +import org.keycloak.authentication.AuthenticationProcessor; +import org.keycloak.authentication.authenticators.broker.AbstractIdpAuthenticator; +import org.keycloak.authentication.authenticators.broker.util.SerializedBrokeredIdentityContext; +import org.keycloak.common.Profile; +import org.keycloak.models.FederatedIdentityModel; +import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderStorageProvider; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.OrderedModel; +import org.keycloak.models.RealmModel; +import org.keycloak.models.UserModel; +import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.services.Urls; +import org.keycloak.services.resources.LoginActionsService; +import org.keycloak.sessions.AuthenticationSessionModel; +import org.keycloak.theme.Theme; + /** * @author Stian Thorgersen * @author Vlastimil Elias (velias at redhat dot com) diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/OAuthGrantBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/OAuthGrantBean.java index 2ea10715de9..fccbeb7f73d 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/OAuthGrantBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/OAuthGrantBean.java @@ -16,14 +16,14 @@ */ package org.keycloak.forms.login.freemarker.model; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.OrderedModel; import org.keycloak.rar.AuthorizationDetails; -import java.util.ArrayList; -import java.util.List; - /** * @author Viliam Rockai */ diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java index 9a0c97299a4..90eab3e6b06 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/ProfileBean.java @@ -16,14 +16,16 @@ */ package org.keycloak.forms.login.freemarker.model; -import org.jboss.logging.Logger; -import org.keycloak.authentication.requiredactions.util.UpdateProfileContext; - -import jakarta.ws.rs.core.MultivaluedMap; import java.util.HashMap; import java.util.List; import java.util.Map; +import jakarta.ws.rs.core.MultivaluedMap; + +import org.keycloak.authentication.requiredactions.util.UpdateProfileContext; + +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen * @author Vlastimil Elias (velias at redhat dot com) diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RealmBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RealmBean.java index 14454204462..c19665dc376 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RealmBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RealmBean.java @@ -16,16 +16,16 @@ */ package org.keycloak.forms.login.freemarker.model; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + import org.keycloak.authentication.actiontoken.idpverifyemail.IdpVerifyAccountLinkActionToken; import org.keycloak.authentication.actiontoken.resetcred.ResetCredentialsActionToken; import org.keycloak.authentication.actiontoken.verifyemail.VerifyEmailActionToken; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.CredentialRepresentation; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.TimeUnit; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RecoveryAuthnCodeInputLoginBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RecoveryAuthnCodeInputLoginBean.java index cdfe335691b..ccf3623b2cd 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RecoveryAuthnCodeInputLoginBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RecoveryAuthnCodeInputLoginBean.java @@ -1,5 +1,7 @@ package org.keycloak.forms.login.freemarker.model; +import java.util.Optional; + import org.keycloak.credential.CredentialModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -7,8 +9,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.credential.RecoveryAuthnCodesCredentialModel; import org.keycloak.models.utils.RecoveryAuthnCodesUtils; -import java.util.Optional; - public class RecoveryAuthnCodeInputLoginBean { private final int codeNumber; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RecoveryAuthnCodesBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RecoveryAuthnCodesBean.java index fd2126fe62b..2c2714341b6 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RecoveryAuthnCodesBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RecoveryAuthnCodesBean.java @@ -1,10 +1,10 @@ package org.keycloak.forms.login.freemarker.model; +import java.util.List; + import org.keycloak.common.util.Time; import org.keycloak.models.utils.RecoveryAuthnCodesUtils; -import java.util.List; - public class RecoveryAuthnCodesBean { private final List generatedRecoveryAuthnCodesList; diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RequiredActionUrlFormatterMethod.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RequiredActionUrlFormatterMethod.java index f7db216dd3d..59d932e9c94 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/RequiredActionUrlFormatterMethod.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/RequiredActionUrlFormatterMethod.java @@ -17,13 +17,14 @@ package org.keycloak.forms.login.freemarker.model; -import freemarker.template.TemplateMethodModelEx; -import freemarker.template.TemplateModelException; +import java.net.URI; +import java.util.List; + import org.keycloak.models.RealmModel; import org.keycloak.services.Urls; -import java.net.URI; -import java.util.List; +import freemarker.template.TemplateMethodModelEx; +import freemarker.template.TemplateModelException; /** */ diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/SAMLPostFormBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/SAMLPostFormBean.java index c06a53af1a3..1d5f88008a6 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/SAMLPostFormBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/SAMLPostFormBean.java @@ -17,6 +17,7 @@ package org.keycloak.forms.login.freemarker.model; import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.saml.common.constants.GeneralConstants; public class SAMLPostFormBean { diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java index a62219b7bef..ea73e3f7515 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/TotpBean.java @@ -16,6 +16,12 @@ */ package org.keycloak.forms.login.freemarker.model; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.authentication.otp.OTPApplicationProvider; import org.keycloak.credential.CredentialModel; import org.keycloak.models.KeycloakSession; @@ -26,11 +32,6 @@ import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.models.utils.HmacOTP; import org.keycloak.utils.TotpUtils; -import jakarta.ws.rs.core.UriBuilder; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - /** * Used for UpdateTotp required action * diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java index 36e3a5365be..2d2e8b6ddbd 100755 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/UrlBean.java @@ -16,15 +16,16 @@ */ package org.keycloak.forms.login.freemarker.model; -import static org.keycloak.protocol.oidc.grants.device.DeviceGrantType.realmOAuth2DeviceVerificationAction; +import java.io.IOException; +import java.net.URI; -import org.jboss.logging.Logger; import org.keycloak.models.RealmModel; import org.keycloak.services.Urls; import org.keycloak.theme.Theme; -import java.io.IOException; -import java.net.URI; +import org.jboss.logging.Logger; + +import static org.keycloak.protocol.oidc.grants.device.DeviceGrantType.realmOAuth2DeviceVerificationAction; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/WebAuthnAuthenticatorsBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/WebAuthnAuthenticatorsBean.java index 65fec237b5c..1a6b05412ad 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/WebAuthnAuthenticatorsBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/WebAuthnAuthenticatorsBean.java @@ -15,7 +15,13 @@ */ package org.keycloak.forms.login.freemarker.model; -import com.webauthn4j.data.AuthenticatorTransport; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.CollectionUtil; import org.keycloak.models.KeycloakSession; @@ -25,12 +31,7 @@ import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.theme.DateTimeFormatterUtil; import org.keycloak.utils.StringUtil; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; +import com.webauthn4j.data.AuthenticatorTransport; public class WebAuthnAuthenticatorsBean { diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java index 87ff8e5cab7..44afd0a28a2 100644 --- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java +++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/X509ConfirmBean.java @@ -16,10 +16,11 @@ */ package org.keycloak.forms.login.freemarker.model; -import jakarta.ws.rs.core.MultivaluedMap; import java.util.HashMap; import java.util.Map; +import jakarta.ws.rs.core.MultivaluedMap; + /** * @author vramik */ diff --git a/services/src/main/java/org/keycloak/headers/DefaultSecurityHeadersProvider.java b/services/src/main/java/org/keycloak/headers/DefaultSecurityHeadersProvider.java index 78b7b69447c..541d5009a37 100644 --- a/services/src/main/java/org/keycloak/headers/DefaultSecurityHeadersProvider.java +++ b/services/src/main/java/org/keycloak/headers/DefaultSecurityHeadersProvider.java @@ -16,22 +16,25 @@ */ package org.keycloak.headers; -import org.jboss.logging.Logger; -import org.keycloak.models.BrowserSecurityHeaders; -import org.keycloak.models.ContentSecurityPolicyBuilder; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; +import java.util.Collections; +import java.util.Map; import jakarta.ws.rs.InternalServerErrorException; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.container.ContainerResponseContext; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; -import java.util.Collections; -import java.util.Map; + +import org.keycloak.models.BrowserSecurityHeaders; +import org.keycloak.models.ContentSecurityPolicyBuilder; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; + +import org.jboss.logging.Logger; import static jakarta.ws.rs.HttpMethod.HEAD; import static jakarta.ws.rs.HttpMethod.OPTIONS; + import static org.keycloak.models.BrowserSecurityHeaders.CONTENT_SECURITY_POLICY; public class DefaultSecurityHeadersProvider implements SecurityHeadersProvider { diff --git a/services/src/main/java/org/keycloak/jose/jws/DefaultTokenManager.java b/services/src/main/java/org/keycloak/jose/jws/DefaultTokenManager.java index 4efefe2d3ed..be60c91594c 100644 --- a/services/src/main/java/org/keycloak/jose/jws/DefaultTokenManager.java +++ b/services/src/main/java/org/keycloak/jose/jws/DefaultTokenManager.java @@ -16,7 +16,15 @@ */ package org.keycloak.jose.jws; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.security.Key; +import java.time.Duration; +import java.util.Comparator; +import java.util.Optional; +import java.util.function.BiConsumer; +import java.util.stream.Stream; + import org.keycloak.Token; import org.keycloak.TokenCategory; import org.keycloak.common.util.SecretGenerator; @@ -29,8 +37,8 @@ import org.keycloak.crypto.KeyUse; import org.keycloak.crypto.KeyWrapper; import org.keycloak.crypto.SignatureProvider; import org.keycloak.crypto.SignatureSignerContext; -import org.keycloak.jose.JOSEParser; import org.keycloak.jose.JOSE; +import org.keycloak.jose.JOSEParser; import org.keycloak.jose.jwe.JWE; import org.keycloak.jose.jwe.JWEConstants; import org.keycloak.jose.jwe.JWEException; @@ -56,14 +64,7 @@ import org.keycloak.services.util.DefaultClientSessionContext; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.security.Key; -import java.time.Duration; -import java.util.Comparator; -import java.util.Optional; -import java.util.function.BiConsumer; -import java.util.stream.Stream; +import org.jboss.logging.Logger; public class DefaultTokenManager implements TokenManager { diff --git a/services/src/main/java/org/keycloak/keys/AbstractEcKeyProvider.java b/services/src/main/java/org/keycloak/keys/AbstractEcKeyProvider.java index 33ccafe07bb..79e2f0c0d7a 100644 --- a/services/src/main/java/org/keycloak/keys/AbstractEcKeyProvider.java +++ b/services/src/main/java/org/keycloak/keys/AbstractEcKeyProvider.java @@ -16,6 +16,11 @@ */ package org.keycloak.keys; +import java.security.KeyPair; +import java.security.cert.X509Certificate; +import java.util.Optional; +import java.util.stream.Stream; + import org.keycloak.common.util.KeyUtils; import org.keycloak.component.ComponentModel; import org.keycloak.crypto.KeyStatus; @@ -24,11 +29,6 @@ import org.keycloak.crypto.KeyUse; import org.keycloak.crypto.KeyWrapper; import org.keycloak.models.RealmModel; -import java.security.KeyPair; -import java.security.cert.X509Certificate; -import java.util.Optional; -import java.util.stream.Stream; - public abstract class AbstractEcKeyProvider implements KeyProvider { private final KeyStatus status; diff --git a/services/src/main/java/org/keycloak/keys/AbstractEcKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/AbstractEcKeyProviderFactory.java index c0c5e3010f1..96f9f91adc8 100644 --- a/services/src/main/java/org/keycloak/keys/AbstractEcKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/AbstractEcKeyProviderFactory.java @@ -16,6 +16,11 @@ */ package org.keycloak.keys; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.SecureRandom; +import java.security.spec.ECGenParameterSpec; + import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; import org.keycloak.models.KeycloakSession; @@ -23,11 +28,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.provider.ConfigurationValidationHelper; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.SecureRandom; -import java.security.spec.ECGenParameterSpec; - public abstract class AbstractEcKeyProviderFactory implements KeyProviderFactory { public static final String DEFAULT_EC_ELLIPTIC_CURVE = "P-256"; diff --git a/services/src/main/java/org/keycloak/keys/AbstractEddsaKeyProvider.java b/services/src/main/java/org/keycloak/keys/AbstractEddsaKeyProvider.java index 92a78d689a0..cfbf6c083da 100644 --- a/services/src/main/java/org/keycloak/keys/AbstractEddsaKeyProvider.java +++ b/services/src/main/java/org/keycloak/keys/AbstractEddsaKeyProvider.java @@ -16,6 +16,9 @@ */ package org.keycloak.keys; +import java.security.KeyPair; +import java.util.stream.Stream; + import org.keycloak.common.util.KeyUtils; import org.keycloak.component.ComponentModel; import org.keycloak.crypto.Algorithm; @@ -25,9 +28,6 @@ import org.keycloak.crypto.KeyUse; import org.keycloak.crypto.KeyWrapper; import org.keycloak.models.RealmModel; -import java.security.KeyPair; -import java.util.stream.Stream; - /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/keys/AbstractEddsaKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/AbstractEddsaKeyProviderFactory.java index 9720c6d41f5..e6ace71356b 100644 --- a/services/src/main/java/org/keycloak/keys/AbstractEddsaKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/AbstractEddsaKeyProviderFactory.java @@ -16,6 +16,9 @@ */ package org.keycloak.keys; +import java.security.KeyPair; +import java.security.KeyPairGenerator; + import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; import org.keycloak.crypto.Algorithm; @@ -25,9 +28,6 @@ import org.keycloak.provider.ConfigurationValidationHelper; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.security.KeyPair; -import java.security.KeyPairGenerator; - import static org.keycloak.provider.ProviderConfigProperty.LIST_TYPE; /** diff --git a/services/src/main/java/org/keycloak/keys/AbstractGeneratedEcKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/AbstractGeneratedEcKeyProviderFactory.java index 62dab9536f6..e171751c88d 100644 --- a/services/src/main/java/org/keycloak/keys/AbstractGeneratedEcKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/AbstractGeneratedEcKeyProviderFactory.java @@ -16,7 +16,12 @@ */ package org.keycloak.keys; -import org.jboss.logging.Logger; +import java.security.KeyFactory; +import java.security.KeyPair; +import java.security.interfaces.ECPublicKey; +import java.security.spec.X509EncodedKeySpec; +import java.util.Base64; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; @@ -26,11 +31,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.provider.ConfigurationValidationHelper; import org.keycloak.provider.ProviderConfigProperty; -import java.security.KeyFactory; -import java.security.KeyPair; -import java.security.interfaces.ECPublicKey; -import java.security.spec.X509EncodedKeySpec; -import java.util.Base64; +import org.jboss.logging.Logger; public abstract class AbstractGeneratedEcKeyProviderFactory extends AbstractEcKeyProviderFactory { diff --git a/services/src/main/java/org/keycloak/keys/AbstractGeneratedRsaKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/AbstractGeneratedRsaKeyProviderFactory.java index 21a3a90ce4d..3c6049314df 100644 --- a/services/src/main/java/org/keycloak/keys/AbstractGeneratedRsaKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/AbstractGeneratedRsaKeyProviderFactory.java @@ -22,7 +22,6 @@ import java.security.PrivateKey; import java.security.cert.Certificate; import java.security.interfaces.RSAPrivateKey; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.common.util.CertificateUtils; import org.keycloak.common.util.KeyUtils; @@ -37,6 +36,8 @@ import org.keycloak.provider.ConfigurationValidationHelper; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; +import org.jboss.logging.Logger; + public abstract class AbstractGeneratedRsaKeyProviderFactory extends AbstractRsaKeyProviderFactory { private int defaultKeySize = 2048; diff --git a/services/src/main/java/org/keycloak/keys/AbstractGeneratedSecretKeyProvider.java b/services/src/main/java/org/keycloak/keys/AbstractGeneratedSecretKeyProvider.java index 51ed75b8b7c..081bb8fa225 100644 --- a/services/src/main/java/org/keycloak/keys/AbstractGeneratedSecretKeyProvider.java +++ b/services/src/main/java/org/keycloak/keys/AbstractGeneratedSecretKeyProvider.java @@ -17,6 +17,9 @@ package org.keycloak.keys; +import java.util.stream.Stream; +import javax.crypto.SecretKey; + import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.KeyUtils; import org.keycloak.component.ComponentModel; @@ -25,9 +28,6 @@ import org.keycloak.crypto.KeyStatus; import org.keycloak.crypto.KeyUse; import org.keycloak.crypto.KeyWrapper; -import javax.crypto.SecretKey; -import java.util.stream.Stream; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/keys/AbstractGeneratedSecretKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/AbstractGeneratedSecretKeyProviderFactory.java index 87c3dde4002..2572df51152 100644 --- a/services/src/main/java/org/keycloak/keys/AbstractGeneratedSecretKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/AbstractGeneratedSecretKeyProviderFactory.java @@ -17,7 +17,6 @@ package org.keycloak.keys; -import org.jboss.logging.Logger; import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.SecretGenerator; import org.keycloak.component.ComponentModel; @@ -27,6 +26,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.ConfigurationValidationHelper; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/keys/AbstractImportedRsaKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/AbstractImportedRsaKeyProviderFactory.java index 64e87ba798b..51b1cdfdd45 100644 --- a/services/src/main/java/org/keycloak/keys/AbstractImportedRsaKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/AbstractImportedRsaKeyProviderFactory.java @@ -17,6 +17,12 @@ package org.keycloak.keys; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + import org.keycloak.common.util.CertificateUtils; import org.keycloak.common.util.KeyUtils; import org.keycloak.common.util.PemUtils; @@ -28,12 +34,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.provider.ConfigurationValidationHelper; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.security.KeyPair; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.cert.CertificateException; -import java.security.cert.X509Certificate; - /** * @author Stian Thorgersen * @author Filipe Bojikian Rissi diff --git a/services/src/main/java/org/keycloak/keys/AbstractRsaKeyProvider.java b/services/src/main/java/org/keycloak/keys/AbstractRsaKeyProvider.java index 257de906e60..f024f329b34 100644 --- a/services/src/main/java/org/keycloak/keys/AbstractRsaKeyProvider.java +++ b/services/src/main/java/org/keycloak/keys/AbstractRsaKeyProvider.java @@ -17,6 +17,14 @@ package org.keycloak.keys; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.cert.X509Certificate; +import java.util.Collections; +import java.util.List; +import java.util.stream.Stream; + import org.keycloak.common.util.KeyUtils; import org.keycloak.common.util.PemUtils; import org.keycloak.component.ComponentModel; @@ -28,14 +36,6 @@ import org.keycloak.crypto.KeyWrapper; import org.keycloak.jose.jwe.JWEConstants; import org.keycloak.models.RealmModel; -import java.security.KeyPair; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.cert.X509Certificate; -import java.util.Collections; -import java.util.List; -import java.util.stream.Stream; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/keys/DefaultKeyManager.java b/services/src/main/java/org/keycloak/keys/DefaultKeyManager.java index 3b6248ff922..648ecd56fca 100644 --- a/services/src/main/java/org/keycloak/keys/DefaultKeyManager.java +++ b/services/src/main/java/org/keycloak/keys/DefaultKeyManager.java @@ -17,17 +17,6 @@ package org.keycloak.keys; -import org.jboss.logging.Logger; -import org.keycloak.component.ComponentModel; -import org.keycloak.crypto.Algorithm; -import org.keycloak.crypto.KeyUse; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.models.KeyManager; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.provider.ProviderFactory; - -import javax.crypto.SecretKey; import java.security.PublicKey; import java.security.cert.Certificate; import java.util.Comparator; @@ -39,6 +28,18 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; +import javax.crypto.SecretKey; + +import org.keycloak.component.ComponentModel; +import org.keycloak.crypto.Algorithm; +import org.keycloak.crypto.KeyUse; +import org.keycloak.crypto.KeyWrapper; +import org.keycloak.models.KeyManager; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.provider.ProviderFactory; + +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/keys/GeneratedAesKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/GeneratedAesKeyProviderFactory.java index be8e2b56966..93e602a54aa 100644 --- a/services/src/main/java/org/keycloak/keys/GeneratedAesKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/GeneratedAesKeyProviderFactory.java @@ -17,7 +17,8 @@ package org.keycloak.keys; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.crypto.Algorithm; @@ -26,7 +27,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; +import org.jboss.logging.Logger; import static org.keycloak.provider.ProviderConfigProperty.LIST_TYPE; diff --git a/services/src/main/java/org/keycloak/keys/GeneratedEcdhKeyProvider.java b/services/src/main/java/org/keycloak/keys/GeneratedEcdhKeyProvider.java index a24c784a14a..5ed9a5831d7 100644 --- a/services/src/main/java/org/keycloak/keys/GeneratedEcdhKeyProvider.java +++ b/services/src/main/java/org/keycloak/keys/GeneratedEcdhKeyProvider.java @@ -16,14 +16,6 @@ */ package org.keycloak.keys; -import org.jboss.logging.Logger; -import org.keycloak.common.util.CertificateUtils; -import org.keycloak.common.util.PemUtils; -import org.keycloak.component.ComponentModel; -import org.keycloak.crypto.KeyUse; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.models.RealmModel; - import java.security.KeyFactory; import java.security.KeyPair; import java.security.PrivateKey; @@ -35,6 +27,15 @@ import java.util.Base64; import java.util.List; import java.util.Optional; +import org.keycloak.common.util.CertificateUtils; +import org.keycloak.common.util.PemUtils; +import org.keycloak.component.ComponentModel; +import org.keycloak.crypto.KeyUse; +import org.keycloak.crypto.KeyWrapper; +import org.keycloak.models.RealmModel; + +import org.jboss.logging.Logger; + public class GeneratedEcdhKeyProvider extends AbstractEcKeyProvider { private static final Logger logger = Logger.getLogger(GeneratedEcdhKeyProvider.class); diff --git a/services/src/main/java/org/keycloak/keys/GeneratedEcdhKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/GeneratedEcdhKeyProviderFactory.java index 967e7c987b3..37dcf7c24b2 100644 --- a/services/src/main/java/org/keycloak/keys/GeneratedEcdhKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/GeneratedEcdhKeyProviderFactory.java @@ -16,16 +16,17 @@ */ package org.keycloak.keys; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyUse; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; -import static org.keycloak.provider.ProviderConfigProperty.LIST_TYPE; +import org.jboss.logging.Logger; -import java.util.List; +import static org.keycloak.provider.ProviderConfigProperty.LIST_TYPE; public class GeneratedEcdhKeyProviderFactory extends AbstractGeneratedEcKeyProviderFactory { diff --git a/services/src/main/java/org/keycloak/keys/GeneratedEcdsaKeyProvider.java b/services/src/main/java/org/keycloak/keys/GeneratedEcdsaKeyProvider.java index ef481fff6e7..bca45c2d265 100644 --- a/services/src/main/java/org/keycloak/keys/GeneratedEcdsaKeyProvider.java +++ b/services/src/main/java/org/keycloak/keys/GeneratedEcdsaKeyProvider.java @@ -16,14 +16,6 @@ */ package org.keycloak.keys; -import org.jboss.logging.Logger; -import org.keycloak.common.util.CertificateUtils; -import org.keycloak.common.util.PemUtils; -import org.keycloak.component.ComponentModel; -import org.keycloak.crypto.KeyUse; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.models.RealmModel; - import java.security.KeyFactory; import java.security.KeyPair; import java.security.PrivateKey; @@ -35,6 +27,15 @@ import java.util.Base64; import java.util.List; import java.util.Optional; +import org.keycloak.common.util.CertificateUtils; +import org.keycloak.common.util.PemUtils; +import org.keycloak.component.ComponentModel; +import org.keycloak.crypto.KeyUse; +import org.keycloak.crypto.KeyWrapper; +import org.keycloak.models.RealmModel; + +import org.jboss.logging.Logger; + public class GeneratedEcdsaKeyProvider extends AbstractEcKeyProvider { private static final Logger logger = Logger.getLogger(GeneratedEcdsaKeyProvider.class); diff --git a/services/src/main/java/org/keycloak/keys/GeneratedEcdsaKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/GeneratedEcdsaKeyProviderFactory.java index f1def90fa93..44ae8b345c7 100644 --- a/services/src/main/java/org/keycloak/keys/GeneratedEcdsaKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/GeneratedEcdsaKeyProviderFactory.java @@ -16,16 +16,17 @@ */ package org.keycloak.keys; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyUse; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; -import static org.keycloak.provider.ProviderConfigProperty.LIST_TYPE; +import org.jboss.logging.Logger; -import java.util.List; +import static org.keycloak.provider.ProviderConfigProperty.LIST_TYPE; public class GeneratedEcdsaKeyProviderFactory extends AbstractGeneratedEcKeyProviderFactory { diff --git a/services/src/main/java/org/keycloak/keys/GeneratedEddsaKeyProvider.java b/services/src/main/java/org/keycloak/keys/GeneratedEddsaKeyProvider.java index e5a2de77682..032d20fd314 100644 --- a/services/src/main/java/org/keycloak/keys/GeneratedEddsaKeyProvider.java +++ b/services/src/main/java/org/keycloak/keys/GeneratedEddsaKeyProvider.java @@ -16,11 +16,6 @@ */ package org.keycloak.keys; -import org.jboss.logging.Logger; -import org.keycloak.component.ComponentModel; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.models.RealmModel; - import java.security.KeyFactory; import java.security.KeyPair; import java.security.PrivateKey; @@ -29,6 +24,12 @@ import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; import java.util.Base64; +import org.keycloak.component.ComponentModel; +import org.keycloak.crypto.KeyWrapper; +import org.keycloak.models.RealmModel; + +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/keys/GeneratedEddsaKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/GeneratedEddsaKeyProviderFactory.java index f4c30e22b52..be21c2939f8 100644 --- a/services/src/main/java/org/keycloak/keys/GeneratedEddsaKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/GeneratedEddsaKeyProviderFactory.java @@ -16,7 +16,13 @@ */ package org.keycloak.keys; -import org.jboss.logging.Logger; +import java.security.KeyFactory; +import java.security.KeyPair; +import java.security.interfaces.EdECPublicKey; +import java.security.spec.X509EncodedKeySpec; +import java.util.Base64; +import java.util.List; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; @@ -27,12 +33,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.provider.ConfigurationValidationHelper; import org.keycloak.provider.ProviderConfigProperty; -import java.security.KeyFactory; -import java.security.KeyPair; -import java.security.interfaces.EdECPublicKey; -import java.security.spec.X509EncodedKeySpec; -import java.util.Base64; -import java.util.List; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/keys/GeneratedHmacKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/GeneratedHmacKeyProviderFactory.java index af4d2da56d9..d541e0b3317 100644 --- a/services/src/main/java/org/keycloak/keys/GeneratedHmacKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/GeneratedHmacKeyProviderFactory.java @@ -17,7 +17,8 @@ package org.keycloak.keys; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.crypto.Algorithm; @@ -26,7 +27,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/keys/GeneratedRsaEncKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/GeneratedRsaEncKeyProviderFactory.java index 6d4e12c5772..ccc32a24bb5 100644 --- a/services/src/main/java/org/keycloak/keys/GeneratedRsaEncKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/GeneratedRsaEncKeyProviderFactory.java @@ -19,13 +19,14 @@ package org.keycloak.keys; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyUse; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/keys/GeneratedRsaKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/GeneratedRsaKeyProviderFactory.java index cc539c07b36..7684457a31e 100644 --- a/services/src/main/java/org/keycloak/keys/GeneratedRsaKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/GeneratedRsaKeyProviderFactory.java @@ -17,14 +17,15 @@ package org.keycloak.keys; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyUse; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/keys/ImportedRsaEncKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/ImportedRsaEncKeyProviderFactory.java index 1fdb42c982e..7c71cdf5eb9 100644 --- a/services/src/main/java/org/keycloak/keys/ImportedRsaEncKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/ImportedRsaEncKeyProviderFactory.java @@ -17,14 +17,14 @@ package org.keycloak.keys; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyUse; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Filipe Bojikian Rissi */ diff --git a/services/src/main/java/org/keycloak/keys/ImportedRsaKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/ImportedRsaKeyProviderFactory.java index 281d023b059..2b5cff41e78 100644 --- a/services/src/main/java/org/keycloak/keys/ImportedRsaKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/ImportedRsaKeyProviderFactory.java @@ -17,14 +17,14 @@ package org.keycloak.keys; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyUse; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/keys/JavaKeystoreKeyProvider.java b/services/src/main/java/org/keycloak/keys/JavaKeystoreKeyProvider.java index 0abccb6c2f8..0d74e6ec37d 100644 --- a/services/src/main/java/org/keycloak/keys/JavaKeystoreKeyProvider.java +++ b/services/src/main/java/org/keycloak/keys/JavaKeystoreKeyProvider.java @@ -17,20 +17,6 @@ package org.keycloak.keys; -import org.keycloak.common.util.KeyUtils; -import org.keycloak.common.util.KeystoreUtil; -import org.keycloak.component.ComponentModel; -import org.keycloak.crypto.Algorithm; -import org.keycloak.crypto.JavaAlgorithm; -import org.keycloak.crypto.KeyStatus; -import org.keycloak.crypto.KeyType; -import org.keycloak.crypto.KeyUse; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.jose.jwe.JWEConstants; -import org.keycloak.models.RealmModel; -import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.vault.VaultTranscriber; - import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; @@ -56,6 +42,20 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.crypto.SecretKey; +import org.keycloak.common.util.KeyUtils; +import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.component.ComponentModel; +import org.keycloak.crypto.Algorithm; +import org.keycloak.crypto.JavaAlgorithm; +import org.keycloak.crypto.KeyStatus; +import org.keycloak.crypto.KeyType; +import org.keycloak.crypto.KeyUse; +import org.keycloak.crypto.KeyWrapper; +import org.keycloak.jose.jwe.JWEConstants; +import org.keycloak.models.RealmModel; +import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.vault.VaultTranscriber; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/keys/JavaKeystoreKeyProviderFactory.java b/services/src/main/java/org/keycloak/keys/JavaKeystoreKeyProviderFactory.java index 71e67bbe3ff..87481958755 100644 --- a/services/src/main/java/org/keycloak/keys/JavaKeystoreKeyProviderFactory.java +++ b/services/src/main/java/org/keycloak/keys/JavaKeystoreKeyProviderFactory.java @@ -17,7 +17,19 @@ package org.keycloak.keys; -import org.jboss.logging.Logger; +import java.security.GeneralSecurityException; +import java.security.cert.CertPath; +import java.security.cert.CertPathValidator; +import java.security.cert.CertificateFactory; +import java.security.cert.PKIXParameters; +import java.security.cert.TrustAnchor; +import java.security.cert.X509Certificate; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Stream; + import org.keycloak.Config; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.util.KeystoreUtil; @@ -31,18 +43,7 @@ import org.keycloak.provider.ConfigurationValidationHelper; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.security.GeneralSecurityException; -import java.security.cert.CertPath; -import java.security.cert.CertPathValidator; -import java.security.cert.CertificateFactory; -import java.security.cert.PKIXParameters; -import java.security.cert.TrustAnchor; -import java.security.cert.X509Certificate; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Stream; +import org.jboss.logging.Logger; import static org.keycloak.provider.ProviderConfigProperty.LIST_TYPE; import static org.keycloak.provider.ProviderConfigProperty.STRING_TYPE; diff --git a/services/src/main/java/org/keycloak/keys/KeyNoteUtils.java b/services/src/main/java/org/keycloak/keys/KeyNoteUtils.java index 76de745639a..a1844070fee 100644 --- a/services/src/main/java/org/keycloak/keys/KeyNoteUtils.java +++ b/services/src/main/java/org/keycloak/keys/KeyNoteUtils.java @@ -18,12 +18,14 @@ package org.keycloak.keys; import java.security.cert.X509Certificate; import java.util.Date; -import org.jboss.logging.Logger; + import org.keycloak.common.util.Time; import org.keycloak.component.ComponentModel; import org.keycloak.crypto.KeyStatus; import org.keycloak.crypto.KeyWrapper; +import org.jboss.logging.Logger; + /** * * @author rmartinc diff --git a/services/src/main/java/org/keycloak/keys/loader/ClientPublicKeyLoader.java b/services/src/main/java/org/keycloak/keys/loader/ClientPublicKeyLoader.java index 7c53ee1cc0c..e06ab3be122 100644 --- a/services/src/main/java/org/keycloak/keys/loader/ClientPublicKeyLoader.java +++ b/services/src/main/java/org/keycloak/keys/loader/ClientPublicKeyLoader.java @@ -17,7 +17,10 @@ package org.keycloak.keys.loader; -import org.jboss.logging.Logger; +import java.security.PublicKey; +import java.security.cert.X509Certificate; +import java.util.Collections; + import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; import org.keycloak.common.util.KeyUtils; import org.keycloak.crypto.JavaAlgorithm; @@ -40,9 +43,7 @@ import org.keycloak.services.util.ResolveRelative; import org.keycloak.util.JWKSUtils; import org.keycloak.util.JsonSerialization; -import java.security.PublicKey; -import java.security.cert.X509Certificate; -import java.util.Collections; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/keys/loader/HardcodedPublicKeyLoader.java b/services/src/main/java/org/keycloak/keys/loader/HardcodedPublicKeyLoader.java index c7c6e441403..31657ec2880 100644 --- a/services/src/main/java/org/keycloak/keys/loader/HardcodedPublicKeyLoader.java +++ b/services/src/main/java/org/keycloak/keys/loader/HardcodedPublicKeyLoader.java @@ -16,6 +16,8 @@ */ package org.keycloak.keys.loader; +import java.util.Collections; + import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.KeyUtils; import org.keycloak.common.util.PemUtils; @@ -26,8 +28,6 @@ import org.keycloak.crypto.KeyWrapper; import org.keycloak.crypto.PublicKeysWrapper; import org.keycloak.keys.PublicKeyLoader; -import java.util.Collections; - /** * * @author hmlnarik diff --git a/services/src/main/java/org/keycloak/keys/loader/OIDCIdentityProviderPublicKeyLoader.java b/services/src/main/java/org/keycloak/keys/loader/OIDCIdentityProviderPublicKeyLoader.java index 694a4a8ac23..fe3bdd03277 100644 --- a/services/src/main/java/org/keycloak/keys/loader/OIDCIdentityProviderPublicKeyLoader.java +++ b/services/src/main/java/org/keycloak/keys/loader/OIDCIdentityProviderPublicKeyLoader.java @@ -17,7 +17,9 @@ package org.keycloak.keys.loader; -import org.jboss.logging.Logger; +import java.security.PublicKey; +import java.util.Collections; + import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.common.util.KeyUtils; import org.keycloak.common.util.PemUtils; @@ -33,8 +35,7 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.utils.JWKSHttpUtils; import org.keycloak.util.JWKSUtils; -import java.security.PublicKey; -import java.util.Collections; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/keys/loader/PublicKeyStorageManager.java b/services/src/main/java/org/keycloak/keys/loader/PublicKeyStorageManager.java index d3ec0b03c03..349ea74f0d5 100644 --- a/services/src/main/java/org/keycloak/keys/loader/PublicKeyStorageManager.java +++ b/services/src/main/java/org/keycloak/keys/loader/PublicKeyStorageManager.java @@ -17,7 +17,8 @@ package org.keycloak.keys.loader; -import org.jboss.logging.Logger; +import java.security.PublicKey; + import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.crypto.KeyWrapper; import org.keycloak.jose.jwk.JWK; @@ -29,7 +30,7 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import java.security.PublicKey; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/locale/DefaultLocaleSelectorProvider.java b/services/src/main/java/org/keycloak/locale/DefaultLocaleSelectorProvider.java index 2e6da2b8349..e72314ec3da 100644 --- a/services/src/main/java/org/keycloak/locale/DefaultLocaleSelectorProvider.java +++ b/services/src/main/java/org/keycloak/locale/DefaultLocaleSelectorProvider.java @@ -16,8 +16,13 @@ */ package org.keycloak.locale; +import java.util.List; +import java.util.Locale; +import java.util.stream.Collectors; + import jakarta.enterprise.context.ContextNotActiveException; -import org.jboss.logging.Logger; +import jakarta.ws.rs.core.HttpHeaders; + import org.keycloak.cookie.CookieProvider; import org.keycloak.cookie.CookieType; import org.keycloak.models.KeycloakSession; @@ -25,11 +30,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.HttpHeaders; - -import java.util.List; -import java.util.Locale; -import java.util.stream.Collectors; +import org.jboss.logging.Logger; public class DefaultLocaleSelectorProvider implements LocaleSelectorProvider { diff --git a/services/src/main/java/org/keycloak/locale/DefaultLocaleUpdaterProvider.java b/services/src/main/java/org/keycloak/locale/DefaultLocaleUpdaterProvider.java index d587b7382b5..274e7e09ad2 100644 --- a/services/src/main/java/org/keycloak/locale/DefaultLocaleUpdaterProvider.java +++ b/services/src/main/java/org/keycloak/locale/DefaultLocaleUpdaterProvider.java @@ -16,7 +16,6 @@ */ package org.keycloak.locale; -import org.jboss.logging.Logger; import org.keycloak.cookie.CookieProvider; import org.keycloak.cookie.CookieType; import org.keycloak.events.Details; @@ -26,6 +25,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; import org.keycloak.storage.ReadOnlyException; +import org.jboss.logging.Logger; + public class DefaultLocaleUpdaterProvider implements LocaleUpdaterProvider { private static final Logger logger = Logger.getLogger(LocaleSelectorProvider.class); diff --git a/services/src/main/java/org/keycloak/models/workflow/AddRequiredActionStepProvider.java b/services/src/main/java/org/keycloak/models/workflow/AddRequiredActionStepProvider.java index d300f22c944..cba6e5ccb6f 100644 --- a/services/src/main/java/org/keycloak/models/workflow/AddRequiredActionStepProvider.java +++ b/services/src/main/java/org/keycloak/models/workflow/AddRequiredActionStepProvider.java @@ -1,11 +1,12 @@ package org.keycloak.models.workflow; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import org.jboss.logging.Logger; + public class AddRequiredActionStepProvider implements WorkflowStepProvider { diff --git a/services/src/main/java/org/keycloak/models/workflow/DeleteUserStepProvider.java b/services/src/main/java/org/keycloak/models/workflow/DeleteUserStepProvider.java index 358b39cedcc..3bdfb4d9040 100644 --- a/services/src/main/java/org/keycloak/models/workflow/DeleteUserStepProvider.java +++ b/services/src/main/java/org/keycloak/models/workflow/DeleteUserStepProvider.java @@ -17,7 +17,6 @@ package org.keycloak.models.workflow; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -26,6 +25,8 @@ import org.keycloak.models.cache.UserCache; import org.keycloak.storage.UserStoragePrivateUtil; import org.keycloak.storage.UserStorageUtil; +import org.jboss.logging.Logger; + public class DeleteUserStepProvider implements WorkflowStepProvider { public static final String PROPAGATE_TO_SP = "propagate-to-provider"; diff --git a/services/src/main/java/org/keycloak/models/workflow/DisableUserStepProvider.java b/services/src/main/java/org/keycloak/models/workflow/DisableUserStepProvider.java index 6d19dc265d7..23b96614b47 100644 --- a/services/src/main/java/org/keycloak/models/workflow/DisableUserStepProvider.java +++ b/services/src/main/java/org/keycloak/models/workflow/DisableUserStepProvider.java @@ -17,12 +17,13 @@ package org.keycloak.models.workflow; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import org.jboss.logging.Logger; + public class DisableUserStepProvider implements WorkflowStepProvider { diff --git a/services/src/main/java/org/keycloak/models/workflow/NotifyUserStepProvider.java b/services/src/main/java/org/keycloak/models/workflow/NotifyUserStepProvider.java index d80b927100b..df634207a5c 100644 --- a/services/src/main/java/org/keycloak/models/workflow/NotifyUserStepProvider.java +++ b/services/src/main/java/org/keycloak/models/workflow/NotifyUserStepProvider.java @@ -17,9 +17,11 @@ package org.keycloak.models.workflow; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_AFTER; +import java.time.Duration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import org.jboss.logging.Logger; import org.keycloak.common.util.DurationConverter; import org.keycloak.component.ComponentModel; import org.keycloak.email.EmailException; @@ -28,10 +30,9 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import java.time.Duration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; + +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_AFTER; public class NotifyUserStepProvider implements WorkflowStepProvider { diff --git a/services/src/main/java/org/keycloak/models/workflow/SetUserAttributeStepProvider.java b/services/src/main/java/org/keycloak/models/workflow/SetUserAttributeStepProvider.java index 3d0e5ccaebe..5932ace728b 100644 --- a/services/src/main/java/org/keycloak/models/workflow/SetUserAttributeStepProvider.java +++ b/services/src/main/java/org/keycloak/models/workflow/SetUserAttributeStepProvider.java @@ -17,17 +17,18 @@ package org.keycloak.models.workflow; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_AFTER; -import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_PRIORITY; +import java.util.List; +import java.util.Map.Entry; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import java.util.List; -import java.util.Map.Entry; +import org.jboss.logging.Logger; + +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_AFTER; +import static org.keycloak.representations.workflows.WorkflowConstants.CONFIG_PRIORITY; public class SetUserAttributeStepProvider implements WorkflowStepProvider { diff --git a/services/src/main/java/org/keycloak/models/workflow/WorkflowRunnerScheduledTask.java b/services/src/main/java/org/keycloak/models/workflow/WorkflowRunnerScheduledTask.java index 97565064ac2..b612dd37490 100644 --- a/services/src/main/java/org/keycloak/models/workflow/WorkflowRunnerScheduledTask.java +++ b/services/src/main/java/org/keycloak/models/workflow/WorkflowRunnerScheduledTask.java @@ -1,6 +1,5 @@ package org.keycloak.models.workflow; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; @@ -8,6 +7,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.timer.ScheduledTask; +import org.jboss.logging.Logger; + /** * A {@link ScheduledTask} that runs all the scheduled steps for resources on a per-realm basis. */ diff --git a/services/src/main/java/org/keycloak/models/workflow/WorkflowsEventListenerFactory.java b/services/src/main/java/org/keycloak/models/workflow/WorkflowsEventListenerFactory.java index 4809c85b32a..f6e0c1b7951 100644 --- a/services/src/main/java/org/keycloak/models/workflow/WorkflowsEventListenerFactory.java +++ b/services/src/main/java/org/keycloak/models/workflow/WorkflowsEventListenerFactory.java @@ -26,9 +26,9 @@ import org.keycloak.events.EventListenerProviderFactory; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.EnvironmentDependentProviderFactory; +import org.keycloak.provider.ProviderEvent; import org.keycloak.services.scheduled.ClusterAwareScheduledTaskRunner; import org.keycloak.timer.TimerProvider; -import org.keycloak.provider.ProviderEvent; public class WorkflowsEventListenerFactory implements EventListenerProviderFactory, EnvironmentDependentProviderFactory { diff --git a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationIdentityProvidersResource.java b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationIdentityProvidersResource.java index 5d8c31aaa4b..6eecdd56080 100644 --- a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationIdentityProvidersResource.java +++ b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationIdentityProvidersResource.java @@ -17,6 +17,8 @@ package org.keycloak.organization.admin.resource; +import java.util.stream.Stream; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -28,18 +30,6 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import java.util.stream.Stream; - -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelException; @@ -53,6 +43,17 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.parameters.RequestBody; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; + @Extension(name = KeycloakOpenAPI.Profiles.ADMIN, value = "") public class OrganizationIdentityProvidersResource { diff --git a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationInvitationResource.java b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationInvitationResource.java index 2252a71657e..6eae394f721 100644 --- a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationInvitationResource.java +++ b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationInvitationResource.java @@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.actiontoken.inviteorg.InviteOrgActionToken; import org.keycloak.common.util.Time; diff --git a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationMemberResource.java b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationMemberResource.java index 3f825096620..ab22f7d2156 100644 --- a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationMemberResource.java +++ b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationMemberResource.java @@ -36,6 +36,23 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; +import org.keycloak.events.admin.OperationType; +import org.keycloak.events.admin.ResourceType; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.ModelException; +import org.keycloak.models.OrganizationModel; +import org.keycloak.models.RealmModel; +import org.keycloak.models.UserModel; +import org.keycloak.models.utils.ModelToRepresentation; +import org.keycloak.organization.OrganizationProvider; +import org.keycloak.representations.idm.MemberRepresentation; +import org.keycloak.representations.idm.MembershipType; +import org.keycloak.representations.idm.OrganizationRepresentation; +import org.keycloak.services.ErrorResponse; +import org.keycloak.services.resources.KeycloakOpenAPI; +import org.keycloak.services.resources.admin.AdminEventBuilder; +import org.keycloak.utils.StringUtil; + import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; @@ -47,23 +64,6 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.events.admin.OperationType; -import org.keycloak.events.admin.ResourceType; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelException; -import org.keycloak.models.OrganizationModel; -import org.keycloak.models.RealmModel; -import org.keycloak.models.UserModel; - -import org.keycloak.models.utils.ModelToRepresentation; -import org.keycloak.organization.OrganizationProvider; -import org.keycloak.representations.idm.MemberRepresentation; -import org.keycloak.representations.idm.MembershipType; -import org.keycloak.representations.idm.OrganizationRepresentation; -import org.keycloak.services.ErrorResponse; -import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.AdminEventBuilder; -import org.keycloak.utils.StringUtil; @Extension(name = KeycloakOpenAPI.Profiles.ADMIN, value = "") public class OrganizationMemberResource { diff --git a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationResource.java b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationResource.java index fefeb22e4c9..723b9dbc789 100644 --- a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationResource.java +++ b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationResource.java @@ -17,6 +17,8 @@ package org.keycloak.organization.admin.resource; +import java.util.Objects; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; @@ -26,14 +28,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.KeycloakSession; @@ -49,7 +44,14 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.AdminEventBuilder; -import java.util.Objects; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; @Extension(name = KeycloakOpenAPI.Profiles.ADMIN, value = "") public class OrganizationResource { diff --git a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationsResource.java b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationsResource.java index bf9451d1f6c..49b38ecf3ea 100644 --- a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationsResource.java +++ b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationsResource.java @@ -32,17 +32,7 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.KeycloakSession; @@ -64,6 +54,18 @@ import org.keycloak.utils.ReservedCharValidator; import org.keycloak.utils.SearchQueryUtils; import org.keycloak.utils.StringUtil; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; + @Extension(name = KeycloakOpenAPI.Profiles.ADMIN, value = "") public class OrganizationsResource { diff --git a/services/src/main/java/org/keycloak/organization/authentication/authenticators/browser/OrganizationAuthenticator.java b/services/src/main/java/org/keycloak/organization/authentication/authenticators/browser/OrganizationAuthenticator.java index 740d713fc72..c743efef886 100644 --- a/services/src/main/java/org/keycloak/organization/authentication/authenticators/browser/OrganizationAuthenticator.java +++ b/services/src/main/java/org/keycloak/organization/authentication/authenticators/browser/OrganizationAuthenticator.java @@ -17,14 +17,6 @@ package org.keycloak.organization.authentication.authenticators.browser; -import static org.keycloak.authentication.AuthenticatorUtil.isSSOAuthentication; -import static org.keycloak.models.OrganizationDomainModel.ANY_DOMAIN; -import static org.keycloak.models.utils.KeycloakModelUtils.findUserByNameOrEmail; -import static org.keycloak.organization.utils.Organizations.getEmailDomain; -import static org.keycloak.organization.utils.Organizations.isEnabledAndOrganizationsPresent; -import static org.keycloak.organization.utils.Organizations.resolveHomeBroker; -import static org.keycloak.utils.StringUtil.isBlank; - import java.util.List; import java.util.Map; import java.util.Optional; @@ -34,6 +26,7 @@ import java.util.stream.Stream; import jakarta.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; + import org.keycloak.WebAuthnConstants; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; @@ -67,6 +60,14 @@ import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.Booleans; +import static org.keycloak.authentication.AuthenticatorUtil.isSSOAuthentication; +import static org.keycloak.models.OrganizationDomainModel.ANY_DOMAIN; +import static org.keycloak.models.utils.KeycloakModelUtils.findUserByNameOrEmail; +import static org.keycloak.organization.utils.Organizations.getEmailDomain; +import static org.keycloak.organization.utils.Organizations.isEnabledAndOrganizationsPresent; +import static org.keycloak.organization.utils.Organizations.resolveHomeBroker; +import static org.keycloak.utils.StringUtil.isBlank; + public class OrganizationAuthenticator extends IdentityProviderAuthenticator { private final KeycloakSession session; diff --git a/services/src/main/java/org/keycloak/organization/authentication/authenticators/browser/OrganizationAuthenticatorFactory.java b/services/src/main/java/org/keycloak/organization/authentication/authenticators/browser/OrganizationAuthenticatorFactory.java index 6acf18774ac..e5b7973b343 100644 --- a/services/src/main/java/org/keycloak/organization/authentication/authenticators/browser/OrganizationAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/organization/authentication/authenticators/browser/OrganizationAuthenticatorFactory.java @@ -17,8 +17,6 @@ package org.keycloak.organization.authentication.authenticators.browser; -import static org.keycloak.provider.ProviderConfigProperty.BOOLEAN_TYPE; - import java.util.Collections; import java.util.List; import java.util.Set; @@ -34,6 +32,8 @@ import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderConfigProperty; +import static org.keycloak.provider.ProviderConfigProperty.BOOLEAN_TYPE; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/organization/protocol/mappers/oidc/OrganizationMembershipMapper.java b/services/src/main/java/org/keycloak/organization/protocol/mappers/oidc/OrganizationMembershipMapper.java index 9e468afc5ca..dc34f0d6105 100644 --- a/services/src/main/java/org/keycloak/organization/protocol/mappers/oidc/OrganizationMembershipMapper.java +++ b/services/src/main/java/org/keycloak/organization/protocol/mappers/oidc/OrganizationMembershipMapper.java @@ -17,9 +17,6 @@ package org.keycloak.organization.protocol.mappers.oidc; -import static org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper.JSON_TYPE; -import static org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -53,6 +50,9 @@ import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.IDToken; +import static org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper.JSON_TYPE; +import static org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper.TOKEN_CLAIM_NAME; + public class OrganizationMembershipMapper extends AbstractOIDCProtocolMapper implements OIDCAccessTokenMapper, OIDCIDTokenMapper, UserInfoTokenMapper, TokenIntrospectionTokenMapper, EnvironmentDependentProviderFactory { public static final String PROVIDER_ID = "oidc-organization-membership-mapper"; diff --git a/services/src/main/java/org/keycloak/organization/protocol/mappers/oidc/OrganizationScope.java b/services/src/main/java/org/keycloak/organization/protocol/mappers/oidc/OrganizationScope.java index 43a819383fd..aa31e49d816 100644 --- a/services/src/main/java/org/keycloak/organization/protocol/mappers/oidc/OrganizationScope.java +++ b/services/src/main/java/org/keycloak/organization/protocol/mappers/oidc/OrganizationScope.java @@ -17,10 +17,6 @@ package org.keycloak.organization.protocol.mappers.oidc; -import static org.keycloak.models.ClientScopeModel.VALUE_SEPARATOR; -import static org.keycloak.organization.utils.Organizations.getProvider; -import static org.keycloak.utils.StringUtil.isBlank; - import java.util.HashSet; import java.util.List; import java.util.Objects; @@ -47,6 +43,10 @@ import org.keycloak.protocol.oidc.TokenManager; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.utils.StringUtil; +import static org.keycloak.models.ClientScopeModel.VALUE_SEPARATOR; +import static org.keycloak.organization.utils.Organizations.getProvider; +import static org.keycloak.utils.StringUtil.isBlank; + /** *

An enum with utility methods to process the {@link OIDCLoginProtocolFactory#ORGANIZATION} scope. * diff --git a/services/src/main/java/org/keycloak/organization/utils/Organizations.java b/services/src/main/java/org/keycloak/organization/utils/Organizations.java index be0d0aa5300..cc27072f0e9 100644 --- a/services/src/main/java/org/keycloak/organization/utils/Organizations.java +++ b/services/src/main/java/org/keycloak/organization/utils/Organizations.java @@ -17,12 +17,6 @@ package org.keycloak.organization.utils; -import static java.util.Optional.of; -import static java.util.Optional.ofNullable; - -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -30,6 +24,9 @@ import java.util.Optional; import java.util.function.Consumer; import java.util.stream.Stream; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.TokenVerifier; import org.keycloak.authentication.actiontoken.inviteorg.InviteOrgActionToken; import org.keycloak.common.Profile; @@ -52,6 +49,9 @@ import org.keycloak.organization.protocol.mappers.oidc.OrganizationScope; import org.keycloak.services.ErrorResponse; import org.keycloak.sessions.AuthenticationSessionModel; +import static java.util.Optional.of; +import static java.util.Optional.ofNullable; + public class Organizations { public static boolean canManageOrganizationGroup(KeycloakSession session, GroupModel group) { diff --git a/services/src/main/java/org/keycloak/organization/validator/OrganizationMemberValidator.java b/services/src/main/java/org/keycloak/organization/validator/OrganizationMemberValidator.java index 6b8196abff2..560d4b68580 100644 --- a/services/src/main/java/org/keycloak/organization/validator/OrganizationMemberValidator.java +++ b/services/src/main/java/org/keycloak/organization/validator/OrganizationMemberValidator.java @@ -17,11 +17,6 @@ package org.keycloak.organization.validator; -import static java.util.Optional.ofNullable; -import static org.keycloak.models.OrganizationDomainModel.ANY_DOMAIN; -import static org.keycloak.organization.utils.Organizations.resolveHomeBroker; -import static org.keycloak.validate.BuiltinValidators.emailValidator; - import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -48,6 +43,12 @@ import org.keycloak.validate.ValidationContext; import org.keycloak.validate.ValidationError; import org.keycloak.validate.ValidatorConfig; +import static java.util.Optional.ofNullable; + +import static org.keycloak.models.OrganizationDomainModel.ANY_DOMAIN; +import static org.keycloak.organization.utils.Organizations.resolveHomeBroker; +import static org.keycloak.validate.BuiltinValidators.emailValidator; + public class OrganizationMemberValidator extends AbstractSimpleValidator implements EnvironmentDependentProviderFactory { public static final String ID = "organization-member-validator"; diff --git a/services/src/main/java/org/keycloak/partialimport/AbstractPartialImport.java b/services/src/main/java/org/keycloak/partialimport/AbstractPartialImport.java index 0e16787cc8a..b018ca916f2 100644 --- a/services/src/main/java/org/keycloak/partialimport/AbstractPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/AbstractPartialImport.java @@ -17,6 +17,10 @@ package org.keycloak.partialimport; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.PartialImportRepresentation; @@ -24,10 +28,6 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.ServicesLogger; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * Base PartialImport for most resource types. * diff --git a/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java b/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java index 76334762dbb..a9ba0f6534c 100644 --- a/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/ClientRolesPartialImport.java @@ -16,6 +16,15 @@ */ package org.keycloak.partialimport; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + +import jakarta.ws.rs.core.Response; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -24,17 +33,8 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.PartialImportRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.ErrorResponse; - -import jakarta.ws.rs.core.Response; import org.keycloak.services.ErrorResponseException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; - /** * Partial Import handler for Client Roles. * diff --git a/services/src/main/java/org/keycloak/partialimport/ClientsPartialImport.java b/services/src/main/java/org/keycloak/partialimport/ClientsPartialImport.java index 546349452da..0454e9c2b36 100755 --- a/services/src/main/java/org/keycloak/partialimport/ClientsPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/ClientsPartialImport.java @@ -17,11 +17,17 @@ package org.keycloak.partialimport; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; +import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; @@ -29,12 +35,7 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.PartialImportRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import org.keycloak.models.UserModel; +import org.jboss.logging.Logger; /** * PartialImport handler for Clients. diff --git a/services/src/main/java/org/keycloak/partialimport/GroupsPartialImport.java b/services/src/main/java/org/keycloak/partialimport/GroupsPartialImport.java index f50e7de2afe..e26c2490582 100644 --- a/services/src/main/java/org/keycloak/partialimport/GroupsPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/GroupsPartialImport.java @@ -17,6 +17,8 @@ package org.keycloak.partialimport; +import java.util.List; + import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -25,8 +27,6 @@ import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.PartialImportRepresentation; -import java.util.List; - /** * Partial import handler for Groups. * diff --git a/services/src/main/java/org/keycloak/partialimport/IdentityProviderMappersPartialImport.java b/services/src/main/java/org/keycloak/partialimport/IdentityProviderMappersPartialImport.java index 02a9144be29..ef0de77e532 100644 --- a/services/src/main/java/org/keycloak/partialimport/IdentityProviderMappersPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/IdentityProviderMappersPartialImport.java @@ -17,6 +17,8 @@ package org.keycloak.partialimport; +import java.util.List; + import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -24,8 +26,6 @@ import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.PartialImportRepresentation; -import java.util.List; - /** * PartialImport handler for Identity Provider Mappers. * diff --git a/services/src/main/java/org/keycloak/partialimport/IdentityProvidersPartialImport.java b/services/src/main/java/org/keycloak/partialimport/IdentityProvidersPartialImport.java index 1b90ba68f0d..425cf2510e5 100644 --- a/services/src/main/java/org/keycloak/partialimport/IdentityProvidersPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/IdentityProvidersPartialImport.java @@ -17,6 +17,8 @@ package org.keycloak.partialimport; +import java.util.List; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; @@ -24,8 +26,6 @@ import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.PartialImportRepresentation; -import java.util.List; - /** * PartialImport handler for Identity Providers. * diff --git a/services/src/main/java/org/keycloak/partialimport/PartialImportManager.java b/services/src/main/java/org/keycloak/partialimport/PartialImportManager.java index faec1057a06..ea7333b9b60 100644 --- a/services/src/main/java/org/keycloak/partialimport/PartialImportManager.java +++ b/services/src/main/java/org/keycloak/partialimport/PartialImportManager.java @@ -17,13 +17,13 @@ package org.keycloak.partialimport; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.PartialImportRepresentation; -import java.util.ArrayList; -import java.util.List; - /** * This class manages the PartialImport handlers. * diff --git a/services/src/main/java/org/keycloak/partialimport/RealmRolesPartialImport.java b/services/src/main/java/org/keycloak/partialimport/RealmRolesPartialImport.java index d94f338e6b3..8a1704f409c 100644 --- a/services/src/main/java/org/keycloak/partialimport/RealmRolesPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/RealmRolesPartialImport.java @@ -16,6 +16,10 @@ */ package org.keycloak.partialimport; +import java.util.List; +import java.util.Objects; +import java.util.Set; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; @@ -23,10 +27,6 @@ import org.keycloak.representations.idm.PartialImportRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.resources.admin.RoleResource; -import java.util.List; -import java.util.Objects; -import java.util.Set; - /** * PartialImport handler for Realm Roles. * diff --git a/services/src/main/java/org/keycloak/partialimport/RolesPartialImport.java b/services/src/main/java/org/keycloak/partialimport/RolesPartialImport.java index b56e2c0338c..128b9a7eba6 100644 --- a/services/src/main/java/org/keycloak/partialimport/RolesPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/RolesPartialImport.java @@ -16,6 +16,13 @@ */ package org.keycloak.partialimport; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + +import jakarta.ws.rs.core.Response; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; @@ -27,12 +34,6 @@ import org.keycloak.representations.idm.RolesRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.ServicesLogger; -import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; - /** * This class handles both realm roles and client roles. It delegates to * RealmRolesPartialImport and ClientRolesPartialImport, which are no longer used diff --git a/services/src/main/java/org/keycloak/partialimport/UsersPartialImport.java b/services/src/main/java/org/keycloak/partialimport/UsersPartialImport.java index d7d3eb1abf2..070d809c426 100755 --- a/services/src/main/java/org/keycloak/partialimport/UsersPartialImport.java +++ b/services/src/main/java/org/keycloak/partialimport/UsersPartialImport.java @@ -17,18 +17,18 @@ package org.keycloak.partialimport; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; +import org.keycloak.models.UserManager; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.representations.idm.PartialImportRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.models.UserManager; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; /** * PartialImport handler for users. diff --git a/services/src/main/java/org/keycloak/protocol/AuthorizationEndpointBase.java b/services/src/main/java/org/keycloak/protocol/AuthorizationEndpointBase.java index 9c91fe9f500..339cde6fb52 100755 --- a/services/src/main/java/org/keycloak/protocol/AuthorizationEndpointBase.java +++ b/services/src/main/java/org/keycloak/protocol/AuthorizationEndpointBase.java @@ -19,7 +19,7 @@ package org.keycloak.protocol; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; + import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.common.ClientConnection; import org.keycloak.events.Details; @@ -43,6 +43,8 @@ import org.keycloak.services.resources.LoginActionsService; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; +import org.jboss.logging.Logger; + /** * Common base class for Authorization REST endpoints implementation, which have to be implemented by each protocol. * diff --git a/services/src/main/java/org/keycloak/protocol/ProtocolMapperUtils.java b/services/src/main/java/org/keycloak/protocol/ProtocolMapperUtils.java index 0db29f7da60..3d0f9e73c2f 100755 --- a/services/src/main/java/org/keycloak/protocol/ProtocolMapperUtils.java +++ b/services/src/main/java/org/keycloak/protocol/ProtocolMapperUtils.java @@ -17,15 +17,6 @@ package org.keycloak.protocol; -import org.keycloak.models.ClientSessionContext; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.UserModel; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory; -import org.keycloak.services.util.DPoPUtil; - import java.lang.reflect.Method; import java.util.AbstractMap; import java.util.Comparator; @@ -35,6 +26,15 @@ import java.util.Objects; import java.util.function.Predicate; import java.util.stream.Stream; +import org.keycloak.models.ClientSessionContext; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.ProtocolMapperModel; +import org.keycloak.models.UserModel; +import org.keycloak.protocol.oidc.OIDCLoginProtocol; +import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory; +import org.keycloak.services.util.DPoPUtil; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java b/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java index 9432bfee92f..aed3c52e66c 100644 --- a/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java +++ b/services/src/main/java/org/keycloak/protocol/RestartLoginCookie.java @@ -17,8 +17,11 @@ package org.keycloak.protocol; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.jboss.logging.Logger; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; +import javax.crypto.SecretKey; + import org.keycloak.Token; import org.keycloak.TokenCategory; import org.keycloak.cookie.CookieProvider; @@ -32,10 +35,8 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.TokenUtil; -import javax.crypto.SecretKey; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; /** * This is an an encoded token that is stored as a cookie so that if there is a client timeout, then the authentication session diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2Protocol.java b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2Protocol.java index 9528a39a4ef..ded51b4219a 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2Protocol.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2Protocol.java @@ -1,7 +1,14 @@ package org.keycloak.protocol.docker; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.server.jaxrs.ResponseBuilderImpl; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.concurrent.atomic.AtomicReference; + +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.util.SecretGenerator; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; @@ -23,13 +30,8 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.TokenUtil; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.concurrent.atomic.AtomicReference; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.server.jaxrs.ResponseBuilderImpl; public class DockerAuthV2Protocol implements LoginProtocol { protected static final Logger logger = Logger.getLogger(DockerEndpoint.class); diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2ProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2ProtocolFactory.java index 84d1ca15343..269eda54b9b 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2ProtocolFactory.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthV2ProtocolFactory.java @@ -1,5 +1,11 @@ package org.keycloak.protocol.docker; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.events.EventBuilder; @@ -13,12 +19,6 @@ import org.keycloak.protocol.docker.mapper.AllowAllDockerProtocolMapper; import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.representations.idm.ClientRepresentation; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public class DockerAuthV2ProtocolFactory extends AbstractLoginProtocolFactory implements EnvironmentDependentProviderFactory { static Map builtins = new HashMap<>(); diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticator.java b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticator.java index 0f668ab21ce..5a7d79d9924 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticator.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticator.java @@ -1,7 +1,13 @@ package org.keycloak.protocol.docker; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.server.jaxrs.ResponseBuilderImpl; +import java.util.Collections; +import java.util.Locale; +import java.util.Optional; + +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.events.Errors; @@ -13,12 +19,8 @@ import org.keycloak.representations.docker.DockerAccess; import org.keycloak.representations.docker.DockerError; import org.keycloak.representations.docker.DockerErrorResponseToken; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.util.Collections; -import java.util.Locale; -import java.util.Optional; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.server.jaxrs.ResponseBuilderImpl; public class DockerAuthenticator extends HttpBasicAuthenticator { private static final Logger logger = Logger.getLogger(DockerAuthenticator.class); diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticatorFactory.java b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticatorFactory.java index 01453a84233..5f6a4d90d85 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerAuthenticatorFactory.java @@ -1,5 +1,8 @@ package org.keycloak.protocol.docker; +import java.util.Collections; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -7,9 +10,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.List; - import static org.keycloak.models.AuthenticationExecutionModel.Requirement; public class DockerAuthenticatorFactory implements AuthenticatorFactory { diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerEndpoint.java b/services/src/main/java/org/keycloak/protocol/docker/DockerEndpoint.java index 788863c3217..c53ff896ab2 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerEndpoint.java @@ -1,6 +1,9 @@ package org.keycloak.protocol.docker; -import org.jboss.logging.Logger; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.common.Profile; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; @@ -19,9 +22,7 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.utils.ProfileHelper; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; +import org.jboss.logging.Logger; /** * Implements a docker-client understandable format. diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerKeyIdentifier.java b/services/src/main/java/org/keycloak/protocol/docker/DockerKeyIdentifier.java index 384f2182a57..5bd63ddcfdb 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerKeyIdentifier.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerKeyIdentifier.java @@ -1,7 +1,5 @@ package org.keycloak.protocol.docker; -import org.keycloak.models.utils.Base32; - import java.security.Key; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -17,6 +15,8 @@ import java.util.function.Supplier; import java.util.stream.Collector; import java.util.stream.Stream; +import org.keycloak.models.utils.Base32; + /** * The “kid” field has to be in a libtrust fingerprint compatible format. Such a format can be generated by following steps: * 1) Take the DER encoded public key which the JWT token was signed against. diff --git a/services/src/main/java/org/keycloak/protocol/docker/DockerV2LoginProtocolService.java b/services/src/main/java/org/keycloak/protocol/docker/DockerV2LoginProtocolService.java index 0a7be66e769..121cb528383 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/DockerV2LoginProtocolService.java +++ b/services/src/main/java/org/keycloak/protocol/docker/DockerV2LoginProtocolService.java @@ -1,5 +1,9 @@ package org.keycloak.protocol.docker; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.Profile; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; @@ -7,10 +11,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.services.resources.RealmsResource; import org.keycloak.utils.ProfileHelper; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; - public class DockerV2LoginProtocolService { private final EventBuilder event; diff --git a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerComposeYamlInstallationProvider.java b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerComposeYamlInstallationProvider.java index 613d436bf72..5bfa4209de9 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerComposeYamlInstallationProvider.java +++ b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerComposeYamlInstallationProvider.java @@ -1,16 +1,5 @@ package org.keycloak.protocol.docker.installation; -import org.jboss.logging.Logger; -import org.keycloak.Config; -import org.keycloak.models.ClientModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.RealmModel; -import org.keycloak.protocol.ClientInstallationProvider; -import org.keycloak.protocol.docker.DockerAuthV2Protocol; -import org.keycloak.protocol.docker.installation.compose.DockerComposeZipContent; - -import jakarta.ws.rs.core.Response; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -22,6 +11,19 @@ import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import jakarta.ws.rs.core.Response; + +import org.keycloak.Config; +import org.keycloak.models.ClientModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.RealmModel; +import org.keycloak.protocol.ClientInstallationProvider; +import org.keycloak.protocol.docker.DockerAuthV2Protocol; +import org.keycloak.protocol.docker.installation.compose.DockerComposeZipContent; + +import org.jboss.logging.Logger; + public class DockerComposeYamlInstallationProvider implements ClientInstallationProvider { private static Logger log = Logger.getLogger(DockerComposeYamlInstallationProvider.class); diff --git a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java index abbca23180c..4cc9dbdcc44 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java +++ b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerRegistryConfigFileInstallationProvider.java @@ -1,5 +1,10 @@ package org.keycloak.protocol.docker.installation; +import java.net.URI; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -8,10 +13,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.docker.DockerAuthV2Protocol; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.net.URI; - public class DockerRegistryConfigFileInstallationProvider implements ClientInstallationProvider { @Override diff --git a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java index 864861409a9..c486c45dc48 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java +++ b/services/src/main/java/org/keycloak/protocol/docker/installation/DockerVariableOverrideInstallationProvider.java @@ -1,5 +1,10 @@ package org.keycloak.protocol.docker.installation; +import java.net.URI; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -8,10 +13,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.docker.DockerAuthV2Protocol; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.net.URI; - public class DockerVariableOverrideInstallationProvider implements ClientInstallationProvider { @Override diff --git a/services/src/main/java/org/keycloak/protocol/docker/installation/compose/DockerCertFileUtils.java b/services/src/main/java/org/keycloak/protocol/docker/installation/compose/DockerCertFileUtils.java index 56ca590fb99..c5a69476479 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/installation/compose/DockerCertFileUtils.java +++ b/services/src/main/java/org/keycloak/protocol/docker/installation/compose/DockerCertFileUtils.java @@ -1,13 +1,13 @@ package org.keycloak.protocol.docker.installation.compose; -import org.keycloak.common.util.PemUtils; - import java.security.PrivateKey; import java.security.PublicKey; import java.security.cert.Certificate; import java.security.cert.CertificateEncodingException; import java.util.Base64; +import org.keycloak.common.util.PemUtils; + public final class DockerCertFileUtils { public static final String BEGIN_CERT = PemUtils.BEGIN_CERT; public static final String END_CERT = PemUtils.END_CERT; diff --git a/services/src/main/java/org/keycloak/protocol/docker/installation/compose/DockerComposeCertsDirectory.java b/services/src/main/java/org/keycloak/protocol/docker/installation/compose/DockerComposeCertsDirectory.java index 2d5746c42de..ccce0a3a73b 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/installation/compose/DockerComposeCertsDirectory.java +++ b/services/src/main/java/org/keycloak/protocol/docker/installation/compose/DockerComposeCertsDirectory.java @@ -1,9 +1,5 @@ package org.keycloak.protocol.docker.installation.compose; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.CertificateUtils; -import org.keycloak.crypto.KeyType; - import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.NoSuchAlgorithmException; @@ -15,6 +11,10 @@ import java.security.cert.CertificateEncodingException; import java.util.AbstractMap; import java.util.Map; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.CertificateUtils; +import org.keycloak.crypto.KeyType; + public class DockerComposeCertsDirectory { private final String directoryName; diff --git a/services/src/main/java/org/keycloak/protocol/docker/mapper/DockerAuthV2ProtocolMapper.java b/services/src/main/java/org/keycloak/protocol/docker/mapper/DockerAuthV2ProtocolMapper.java index 69ccd004edc..ea83a78e53c 100644 --- a/services/src/main/java/org/keycloak/protocol/docker/mapper/DockerAuthV2ProtocolMapper.java +++ b/services/src/main/java/org/keycloak/protocol/docker/mapper/DockerAuthV2ProtocolMapper.java @@ -1,5 +1,8 @@ package org.keycloak.protocol.docker.mapper; +import java.util.Collections; +import java.util.List; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; @@ -7,9 +10,6 @@ import org.keycloak.protocol.ProtocolMapper; import org.keycloak.protocol.docker.DockerAuthV2Protocol; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.List; - public abstract class DockerAuthV2ProtocolMapper implements ProtocolMapper { public static final String DOCKER_AUTH_V2_CATEGORY = "Docker Auth Mapper"; diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/OID4VCLoginProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vc/OID4VCLoginProtocolFactory.java index 549c9bc499f..7a9d3e53946 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/OID4VCLoginProtocolFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/OID4VCLoginProtocolFactory.java @@ -20,7 +20,6 @@ package org.keycloak.protocol.oid4vc; import java.util.HashMap; import java.util.Map; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.constants.Oid4VciConstants; import org.keycloak.events.EventBuilder; @@ -42,6 +41,8 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation; +import org.jboss.logging.Logger; + import static org.keycloak.constants.Oid4VciConstants.OID4VC_PROTOCOL; import static org.keycloak.models.ClientScopeModel.INCLUDE_IN_TOKEN_SCOPE; import static org.keycloak.models.oid4vci.CredentialScopeModel.CONFIGURATION_ID; diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/JWTVCIssuerWellKnownProvider.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/JWTVCIssuerWellKnownProvider.java index d99589279b2..9c45008b92b 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/JWTVCIssuerWellKnownProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/JWTVCIssuerWellKnownProvider.java @@ -17,6 +17,7 @@ package org.keycloak.protocol.oid4vc.issuance; import jakarta.ws.rs.core.UriInfo; + import org.keycloak.jose.jwk.JSONWebKeySet; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsProcessor.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsProcessor.java index dbcf10f5f21..037e96e0e9b 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsProcessor.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsProcessor.java @@ -17,21 +17,6 @@ package org.keycloak.protocol.oid4vc.issuance; -import com.fasterxml.jackson.core.type.TypeReference; -import org.jboss.logging.Logger; -import org.keycloak.OAuthErrorException; -import org.keycloak.models.ClientSessionContext; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.UserSessionModel; -import org.keycloak.models.AuthenticatedClientSessionModel; -import org.keycloak.protocol.oid4vc.model.AuthorizationDetail; -import org.keycloak.protocol.oid4vc.model.ClaimsDescription; -import org.keycloak.protocol.oid4vc.model.SupportedCredentialConfiguration; -import org.keycloak.protocol.oid4vc.model.Claim; -import org.keycloak.util.JsonSerialization; -import org.keycloak.protocol.oidc.rar.AuthorizationDetailsProcessor; -import org.keycloak.protocol.oidc.rar.AuthorizationDetailsResponse; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -39,7 +24,22 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; +import org.keycloak.OAuthErrorException; +import org.keycloak.models.AuthenticatedClientSessionModel; +import org.keycloak.models.ClientSessionContext; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.UserSessionModel; +import org.keycloak.protocol.oid4vc.model.AuthorizationDetail; +import org.keycloak.protocol.oid4vc.model.Claim; +import org.keycloak.protocol.oid4vc.model.ClaimsDescription; +import org.keycloak.protocol.oid4vc.model.SupportedCredentialConfiguration; import org.keycloak.protocol.oid4vc.utils.ClaimsPathPointer; +import org.keycloak.protocol.oidc.rar.AuthorizationDetailsProcessor; +import org.keycloak.protocol.oidc.rar.AuthorizationDetailsResponse; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.type.TypeReference; +import org.jboss.logging.Logger; import static org.keycloak.models.Constants.AUTHORIZATION_DETAILS_RESPONSE; diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsResponse.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsResponse.java index c1e8ae64829..66f26ae9815 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsResponse.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsResponse.java @@ -16,12 +16,12 @@ */ package org.keycloak.protocol.oid4vc.issuance; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; import org.keycloak.protocol.oid4vc.model.ClaimsDescription; import org.keycloak.protocol.oidc.rar.AuthorizationDetailsResponse; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; /** * OID4VCI-specific authorization details response that extends the generic response diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerEndpoint.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerEndpoint.java index 53ecff18dc0..e615e9b4028 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerEndpoint.java @@ -17,102 +17,6 @@ package org.keycloak.protocol.oid4vc.issuance; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.google.zxing.BarcodeFormat; -import com.google.zxing.WriterException; -import com.google.zxing.client.j2se.MatrixToImageWriter; -import com.google.zxing.common.BitMatrix; -import com.google.zxing.qrcode.QRCodeWriter; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.OPTIONS; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import org.apache.commons.io.IOUtils; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpOptions; -import org.apache.http.client.methods.HttpPost; -import org.jboss.logging.Logger; -import org.keycloak.common.util.SecretGenerator; -import org.keycloak.crypto.KeyUse; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.OAuth2Constants; -import org.keycloak.constants.Oid4VciConstants; -import org.keycloak.events.Errors; -import org.keycloak.events.EventBuilder; -import org.keycloak.jose.JOSEHeader; -import org.keycloak.jose.jwe.JWE; -import org.keycloak.jose.jwe.JWEException; -import org.keycloak.jose.jwe.JWEHeader; -import org.keycloak.jose.jwk.JWK; -import org.keycloak.jose.jwk.JWKParser; -import org.keycloak.models.AuthenticatedClientSessionModel; -import org.keycloak.models.ClientModel; -import org.keycloak.models.ClientScopeModel; -import org.keycloak.models.KeyManager; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.RealmModel; -import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.ProtocolMapper; -import org.keycloak.protocol.oid4vc.OID4VCLoginProtocolFactory; -import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.CredentialBody; -import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.CredentialBuilder; -import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.CredentialBuilderFactory; -import org.keycloak.protocol.oid4vc.issuance.keybinding.CNonceHandler; -import org.keycloak.protocol.oid4vc.issuance.keybinding.JwtCNonceHandler; -import org.keycloak.protocol.oid4vc.issuance.keybinding.ProofValidator; -import org.keycloak.protocol.oid4vc.issuance.mappers.OID4VCMapper; -import org.keycloak.protocol.oid4vc.issuance.signing.CredentialSigner; -import org.keycloak.protocol.oid4vc.model.CredentialIssuer; -import org.keycloak.protocol.oid4vc.model.CredentialOfferURI; -import org.keycloak.protocol.oid4vc.model.CredentialRequest; -import org.keycloak.protocol.oid4vc.model.CredentialRequestEncryptionMetadata; -import org.keycloak.protocol.oid4vc.model.CredentialResponse; -import org.keycloak.protocol.oid4vc.model.CredentialResponseEncryption; -import org.keycloak.protocol.oid4vc.model.CredentialResponseEncryptionMetadata; -import org.keycloak.protocol.oid4vc.model.CredentialsOffer; -import org.keycloak.protocol.oid4vc.model.JwtProof; -import org.keycloak.services.ErrorResponseException; -import org.keycloak.protocol.oid4vc.model.ErrorResponse; -import org.keycloak.protocol.oid4vc.model.ErrorType; -import org.keycloak.protocol.oid4vc.model.Format; -import org.keycloak.protocol.oid4vc.model.NonceResponse; -import org.keycloak.protocol.oid4vc.model.OfferUriType; -import org.keycloak.protocol.oid4vc.model.PreAuthorizedCode; -import org.keycloak.protocol.oid4vc.model.PreAuthorizedGrant; -import org.keycloak.protocol.oid4vc.model.ProofType; -import org.keycloak.protocol.oid4vc.model.Proofs; -import org.keycloak.protocol.oid4vc.model.SupportedCredentialConfiguration; -import org.keycloak.protocol.oid4vc.model.VerifiableCredential; -import org.keycloak.protocol.oid4vc.model.ClaimsDescription; -import org.keycloak.protocol.oid4vc.utils.ClaimsPathPointer; -import com.fasterxml.jackson.core.type.TypeReference; -import org.keycloak.protocol.oidc.grants.PreAuthorizedCodeGrantType; -import org.keycloak.protocol.oidc.grants.PreAuthorizedCodeGrantTypeFactory; -import org.keycloak.protocol.oidc.utils.OAuth2Code; -import org.keycloak.protocol.oidc.utils.OAuth2CodeParser; -import org.keycloak.representations.AccessToken; -import org.keycloak.saml.processing.api.util.DeflateUtil; -import org.keycloak.services.CorsErrorResponseException; -import org.keycloak.services.cors.Cors; -import org.keycloak.services.managers.AppAuthManager; -import org.keycloak.services.managers.AuthenticationManager; -import org.keycloak.services.util.DPoPUtil; -import org.keycloak.util.JsonSerialization; -import org.keycloak.utils.MediaType; -import org.keycloak.representations.dpop.DPoP; -import org.keycloak.common.VerificationException; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.net.URLEncoder; @@ -128,6 +32,104 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + +import org.keycloak.OAuth2Constants; +import org.keycloak.common.VerificationException; +import org.keycloak.common.util.SecretGenerator; +import org.keycloak.constants.Oid4VciConstants; +import org.keycloak.crypto.KeyUse; +import org.keycloak.crypto.KeyWrapper; +import org.keycloak.events.Errors; +import org.keycloak.events.EventBuilder; +import org.keycloak.jose.JOSEHeader; +import org.keycloak.jose.jwe.JWE; +import org.keycloak.jose.jwe.JWEException; +import org.keycloak.jose.jwe.JWEHeader; +import org.keycloak.jose.jwk.JWK; +import org.keycloak.jose.jwk.JWKParser; +import org.keycloak.models.AuthenticatedClientSessionModel; +import org.keycloak.models.ClientModel; +import org.keycloak.models.ClientScopeModel; +import org.keycloak.models.KeyManager; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.RealmModel; +import org.keycloak.models.UserSessionModel; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.protocol.ProtocolMapper; +import org.keycloak.protocol.oid4vc.OID4VCLoginProtocolFactory; +import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.CredentialBody; +import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.CredentialBuilder; +import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.CredentialBuilderFactory; +import org.keycloak.protocol.oid4vc.issuance.keybinding.CNonceHandler; +import org.keycloak.protocol.oid4vc.issuance.keybinding.JwtCNonceHandler; +import org.keycloak.protocol.oid4vc.issuance.keybinding.ProofValidator; +import org.keycloak.protocol.oid4vc.issuance.mappers.OID4VCMapper; +import org.keycloak.protocol.oid4vc.issuance.signing.CredentialSigner; +import org.keycloak.protocol.oid4vc.model.ClaimsDescription; +import org.keycloak.protocol.oid4vc.model.CredentialIssuer; +import org.keycloak.protocol.oid4vc.model.CredentialOfferURI; +import org.keycloak.protocol.oid4vc.model.CredentialRequest; +import org.keycloak.protocol.oid4vc.model.CredentialRequestEncryptionMetadata; +import org.keycloak.protocol.oid4vc.model.CredentialResponse; +import org.keycloak.protocol.oid4vc.model.CredentialResponseEncryption; +import org.keycloak.protocol.oid4vc.model.CredentialResponseEncryptionMetadata; +import org.keycloak.protocol.oid4vc.model.CredentialsOffer; +import org.keycloak.protocol.oid4vc.model.ErrorResponse; +import org.keycloak.protocol.oid4vc.model.ErrorType; +import org.keycloak.protocol.oid4vc.model.Format; +import org.keycloak.protocol.oid4vc.model.JwtProof; +import org.keycloak.protocol.oid4vc.model.NonceResponse; +import org.keycloak.protocol.oid4vc.model.OfferUriType; +import org.keycloak.protocol.oid4vc.model.PreAuthorizedCode; +import org.keycloak.protocol.oid4vc.model.PreAuthorizedGrant; +import org.keycloak.protocol.oid4vc.model.ProofType; +import org.keycloak.protocol.oid4vc.model.Proofs; +import org.keycloak.protocol.oid4vc.model.SupportedCredentialConfiguration; +import org.keycloak.protocol.oid4vc.model.VerifiableCredential; +import org.keycloak.protocol.oid4vc.utils.ClaimsPathPointer; +import org.keycloak.protocol.oidc.grants.PreAuthorizedCodeGrantType; +import org.keycloak.protocol.oidc.grants.PreAuthorizedCodeGrantTypeFactory; +import org.keycloak.protocol.oidc.utils.OAuth2Code; +import org.keycloak.protocol.oidc.utils.OAuth2CodeParser; +import org.keycloak.representations.AccessToken; +import org.keycloak.representations.dpop.DPoP; +import org.keycloak.saml.processing.api.util.DeflateUtil; +import org.keycloak.services.CorsErrorResponseException; +import org.keycloak.services.ErrorResponseException; +import org.keycloak.services.cors.Cors; +import org.keycloak.services.managers.AppAuthManager; +import org.keycloak.services.managers.AuthenticationManager; +import org.keycloak.services.util.DPoPUtil; +import org.keycloak.util.JsonSerialization; +import org.keycloak.utils.MediaType; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.google.zxing.BarcodeFormat; +import com.google.zxing.WriterException; +import com.google.zxing.client.j2se.MatrixToImageWriter; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.qrcode.QRCodeWriter; +import org.apache.commons.io.IOUtils; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpOptions; +import org.apache.http.client.methods.HttpPost; +import org.jboss.logging.Logger; + /** * Provides the (REST-)endpoints required for the OID4VCI protocol. *

diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerWellKnownProvider.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerWellKnownProvider.java index b6f49b6a6a1..b336574ec42 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerWellKnownProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerWellKnownProvider.java @@ -17,9 +17,16 @@ package org.keycloak.protocol.oid4vc.issuance; +import java.net.URI; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import org.apache.http.HttpHeaders; + import org.keycloak.common.util.Time; import org.keycloak.constants.Oid4VciConstants; import org.keycloak.crypto.CryptoUtils; @@ -40,26 +47,20 @@ import org.keycloak.models.oid4vci.CredentialScopeModel; import org.keycloak.protocol.oid4vc.OID4VCLoginProtocolFactory; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.CredentialBuilder; import org.keycloak.protocol.oid4vc.model.CredentialIssuer; -import java.net.URI; - -import org.keycloak.protocol.oid4vc.model.CredentialResponseEncryptionMetadata; import org.keycloak.protocol.oid4vc.model.CredentialRequestEncryptionMetadata; +import org.keycloak.protocol.oid4vc.model.CredentialResponseEncryptionMetadata; import org.keycloak.protocol.oid4vc.model.SupportedCredentialConfiguration; -import org.keycloak.representations.JsonWebToken; import org.keycloak.protocol.oidc.utils.JWKSServerUtils; +import org.keycloak.representations.JsonWebToken; import org.keycloak.services.Urls; import org.keycloak.services.resources.ServerMetadataResource; import org.keycloak.urls.UrlType; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.MediaType; import org.keycloak.wellknown.WellKnownProvider; -import org.jboss.logging.Logger; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; +import org.apache.http.HttpHeaders; +import org.jboss.logging.Logger; import static org.keycloak.constants.Oid4VciConstants.SIGNED_METADATA_JWT_TYPE; import static org.keycloak.crypto.KeyType.RSA; diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerWellKnownProviderFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerWellKnownProviderFactory.java index d1aaff8ae7d..edf58a4e346 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerWellKnownProviderFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/OID4VCIssuerWellKnownProviderFactory.java @@ -18,12 +18,12 @@ package org.keycloak.protocol.oid4vc.issuance; import org.keycloak.Config; +import org.keycloak.constants.Oid4VciConstants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.protocol.oid4vc.OID4VCEnvironmentProviderFactory; import org.keycloak.wellknown.WellKnownProvider; import org.keycloak.wellknown.WellKnownProviderFactory; -import org.keycloak.constants.Oid4VciConstants; /** * {@link WellKnownProviderFactory} implementation for the OID4VCI metadata diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/VCIssuanceContext.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/VCIssuanceContext.java index 9b6a89352a6..a2aca20e91d 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/VCIssuanceContext.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/VCIssuanceContext.java @@ -16,6 +16,8 @@ */ package org.keycloak.protocol.oid4vc.issuance; +import java.util.List; + import org.keycloak.jose.jwk.JWK; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.CredentialBody; import org.keycloak.protocol.oid4vc.model.CredentialRequest; @@ -23,8 +25,6 @@ import org.keycloak.protocol.oid4vc.model.SupportedCredentialConfiguration; import org.keycloak.protocol.oid4vc.model.VerifiableCredential; import org.keycloak.services.managers.AuthenticationManager; -import java.util.List; - /** * Holds the verifiable credential to sign and additional context information. * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/CredentialBuilderUtils.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/CredentialBuilderUtils.java index a0bbfb24ad0..728e56af540 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/CredentialBuilderUtils.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/CredentialBuilderUtils.java @@ -17,12 +17,12 @@ package org.keycloak.protocol.oid4vc.issuance.credentialbuilder; -import org.keycloak.protocol.oid4vc.model.VerifiableCredential; - import java.net.URI; import java.util.Optional; import java.util.UUID; +import org.keycloak.protocol.oid4vc.model.VerifiableCredential; + public class CredentialBuilderUtils { private static final String ID_TEMPLATE = "urn:uuid:%s"; diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBody.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBody.java index 6218f6f8a17..92fe5240195 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBody.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBody.java @@ -17,11 +17,12 @@ package org.keycloak.protocol.oid4vc.issuance.credentialbuilder; -import org.jboss.logging.Logger; import org.keycloak.crypto.SignatureSignerContext; import org.keycloak.jose.jwk.JWK; import org.keycloak.jose.jws.JWSBuilder; +import org.jboss.logging.Logger; + /** * @author Ingrid Kamga */ diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBuilder.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBuilder.java index a0b47ccf401..9d73750b24b 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBuilder.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBuilder.java @@ -17,6 +17,9 @@ package org.keycloak.protocol.oid4vc.issuance.credentialbuilder; +import java.time.Instant; +import java.util.Optional; + import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.protocol.oid4vc.issuance.TimeProvider; import org.keycloak.protocol.oid4vc.model.CredentialBuildConfig; @@ -24,9 +27,6 @@ import org.keycloak.protocol.oid4vc.model.Format; import org.keycloak.protocol.oid4vc.model.VerifiableCredential; import org.keycloak.representations.JsonWebToken; -import java.time.Instant; -import java.util.Optional; - public class JwtCredentialBuilder implements CredentialBuilder { private static final String VC_CLAIM_KEY = "vc"; diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBuilderFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBuilderFactory.java index 2eaf5ceb66c..bee484e23d9 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBuilderFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/JwtCredentialBuilderFactory.java @@ -18,14 +18,14 @@ package org.keycloak.protocol.oid4vc.issuance.credentialbuilder; import java.util.ArrayList; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oid4vc.issuance.OffsetTimeProvider; import org.keycloak.protocol.oid4vc.model.Format; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Ingrid Kamga */ diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/LDCredentialBody.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/LDCredentialBody.java index b42ac12176d..6082f1f0b71 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/LDCredentialBody.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/LDCredentialBody.java @@ -17,10 +17,11 @@ package org.keycloak.protocol.oid4vc.issuance.credentialbuilder; -import org.jboss.logging.Logger; import org.keycloak.jose.jwk.JWK; import org.keycloak.protocol.oid4vc.model.VerifiableCredential; +import org.jboss.logging.Logger; + /** * @author Ingrid Kamga */ diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/LDCredentialBuilderFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/LDCredentialBuilderFactory.java index 777a5fbb028..cc450a2ea88 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/LDCredentialBuilderFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/LDCredentialBuilderFactory.java @@ -18,13 +18,13 @@ package org.keycloak.protocol.oid4vc.issuance.credentialbuilder; import java.util.ArrayList; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oid4vc.model.Format; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Ingrid Kamga */ diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBody.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBody.java index caeae0dccf1..80b2aad1693 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBody.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBody.java @@ -17,13 +17,14 @@ package org.keycloak.protocol.oid4vc.issuance.credentialbuilder; -import com.fasterxml.jackson.databind.JsonNode; +import java.util.Map; + import org.keycloak.crypto.SignatureSignerContext; import org.keycloak.jose.jwk.JWK; import org.keycloak.sdjwt.SdJwt; import org.keycloak.util.JsonSerialization; -import java.util.Map; +import com.fasterxml.jackson.databind.JsonNode; /** * @author Ingrid Kamga diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilder.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilder.java index e299ceeadc4..8a2017e5b28 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilder.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilder.java @@ -17,6 +17,10 @@ package org.keycloak.protocol.oid4vc.issuance.credentialbuilder; +import java.util.List; +import java.util.Map; +import java.util.stream.IntStream; + import org.keycloak.protocol.oid4vc.model.CredentialBuildConfig; import org.keycloak.protocol.oid4vc.model.CredentialSubject; import org.keycloak.protocol.oid4vc.model.Format; @@ -25,10 +29,6 @@ import org.keycloak.sdjwt.DisclosureSpec; import org.keycloak.sdjwt.SdJwt; import org.keycloak.sdjwt.SdJwtUtils; -import java.util.List; -import java.util.Map; -import java.util.stream.IntStream; - public class SdJwtCredentialBuilder implements CredentialBuilder { public static final String ISSUER_CLAIM = "iss"; diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilderFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilderFactory.java index 147675e3400..c81943e27d8 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilderFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilderFactory.java @@ -18,13 +18,13 @@ package org.keycloak.protocol.oid4vc.issuance.credentialbuilder; import java.util.ArrayList; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oid4vc.model.Format; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Ingrid Kamga */ diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationKeyResolver.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationKeyResolver.java index b89d88a978d..7b153c7106b 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationKeyResolver.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationKeyResolver.java @@ -17,10 +17,10 @@ package org.keycloak.protocol.oid4vc.issuance.keybinding; -import org.keycloak.jose.jwk.JWK; - import java.util.Map; +import org.keycloak.jose.jwk.JWK; + /** * Interface for resolving attestation public keys by kid for JWT attestation validation. * Implementations may use local registries, remote JWKS, or other trusted sources. diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationProofValidator.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationProofValidator.java index 728565b5f38..665f8870d94 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationProofValidator.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationProofValidator.java @@ -17,6 +17,9 @@ package org.keycloak.protocol.oid4vc.issuance.keybinding; +import java.util.List; +import java.util.Optional; + import org.keycloak.jose.jwk.JWK; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oid4vc.issuance.VCIssuanceContext; @@ -26,10 +29,6 @@ import org.keycloak.protocol.oid4vc.model.ProofType; import org.keycloak.protocol.oid4vc.model.Proofs; import org.keycloak.protocol.oid4vc.model.SupportedCredentialConfiguration; - -import java.util.List; -import java.util.Optional; - /** * Validates attestation proofs as per OID4VCI specification. * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationProofValidatorFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationProofValidatorFactory.java index 6239336ebf5..3e2abb574c9 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationProofValidatorFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationProofValidatorFactory.java @@ -17,12 +17,12 @@ package org.keycloak.protocol.oid4vc.issuance.keybinding; +import java.util.Map; + import org.keycloak.jose.jwk.JWK; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oid4vc.model.ProofType; -import java.util.Map; - /** * @author Rodrick Awambeng */ diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationValidatorUtil.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationValidatorUtil.java index 470d3f4673c..4a9c1c1640a 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationValidatorUtil.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/AttestationValidatorUtil.java @@ -17,30 +17,6 @@ package org.keycloak.protocol.oid4vc.issuance.keybinding; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import org.keycloak.common.VerificationException; -import org.keycloak.crypto.KeyUse; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.crypto.SignatureProvider; -import org.keycloak.crypto.SignatureVerifierContext; -import org.keycloak.jose.jwk.JWK; -import org.keycloak.jose.jwk.JWKBuilder; -import org.keycloak.jose.jwk.JWKParser; -import org.keycloak.jose.jws.Algorithm; -import org.keycloak.jose.jws.JWSHeader; -import org.keycloak.jose.jws.JWSInput; -import org.keycloak.jose.jws.JWSInputException; -import org.keycloak.models.KeycloakSession; -import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvider; -import org.keycloak.protocol.oid4vc.issuance.VCIssuanceContext; -import org.keycloak.protocol.oid4vc.issuance.VCIssuerException; -import org.keycloak.protocol.oid4vc.model.ISO18045ResistanceLevel; -import org.keycloak.protocol.oid4vc.model.KeyAttestationJwtBody; -import org.keycloak.protocol.oid4vc.model.KeyAttestationsRequired; -import org.keycloak.protocol.oid4vc.model.SupportedProofTypeData; -import org.keycloak.util.JsonSerialization; - import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.IOException; @@ -67,6 +43,31 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.common.VerificationException; +import org.keycloak.crypto.KeyUse; +import org.keycloak.crypto.KeyWrapper; +import org.keycloak.crypto.SignatureProvider; +import org.keycloak.crypto.SignatureVerifierContext; +import org.keycloak.jose.jwk.JWK; +import org.keycloak.jose.jwk.JWKBuilder; +import org.keycloak.jose.jwk.JWKParser; +import org.keycloak.jose.jws.Algorithm; +import org.keycloak.jose.jws.JWSHeader; +import org.keycloak.jose.jws.JWSInput; +import org.keycloak.jose.jws.JWSInputException; +import org.keycloak.models.KeycloakSession; +import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvider; +import org.keycloak.protocol.oid4vc.issuance.VCIssuanceContext; +import org.keycloak.protocol.oid4vc.issuance.VCIssuerException; +import org.keycloak.protocol.oid4vc.model.ISO18045ResistanceLevel; +import org.keycloak.protocol.oid4vc.model.KeyAttestationJwtBody; +import org.keycloak.protocol.oid4vc.model.KeyAttestationsRequired; +import org.keycloak.protocol.oid4vc.model.SupportedProofTypeData; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; + import static org.keycloak.protocol.oid4vc.model.ProofType.JWT; import static org.keycloak.services.clientpolicy.executor.FapiConstant.ALLOWED_ALGORITHMS; diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/CNonceHandler.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/CNonceHandler.java index c73b55189e5..598b1975ce6 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/CNonceHandler.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/CNonceHandler.java @@ -18,13 +18,14 @@ package org.keycloak.protocol.oid4vc.issuance.keybinding; -import jakarta.annotation.Nullable; -import org.keycloak.common.VerificationException; -import org.keycloak.provider.Provider; - import java.util.List; import java.util.Map; +import jakarta.annotation.Nullable; + +import org.keycloak.common.VerificationException; +import org.keycloak.provider.Provider; + /** * @author Pascal Knüppel */ diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtCNonceHandler.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtCNonceHandler.java index 6f0265359c8..3b27a98cfef 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtCNonceHandler.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtCNonceHandler.java @@ -18,27 +18,6 @@ package org.keycloak.protocol.oid4vc.issuance.keybinding; -import jakarta.annotation.Nullable; -import org.keycloak.TokenVerifier; -import org.keycloak.common.VerificationException; -import org.keycloak.crypto.Algorithm; -import org.keycloak.crypto.KeyUse; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.crypto.SignatureProvider; -import org.keycloak.crypto.SignatureSignerContext; -import org.keycloak.crypto.SignatureVerifierContext; -import org.keycloak.jose.jws.JWSBuilder; -import org.keycloak.models.KeycloakContext; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.constants.Oid4VciConstants; -import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvider; -import org.keycloak.protocol.oid4vc.model.JwtCNonce; -import org.keycloak.representations.JsonWebToken; -import org.keycloak.saml.RandomSecret; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.ArrayList; @@ -51,6 +30,29 @@ import java.util.Objects; import java.util.Optional; import java.util.Random; +import jakarta.annotation.Nullable; + +import org.keycloak.TokenVerifier; +import org.keycloak.common.VerificationException; +import org.keycloak.constants.Oid4VciConstants; +import org.keycloak.crypto.Algorithm; +import org.keycloak.crypto.KeyUse; +import org.keycloak.crypto.KeyWrapper; +import org.keycloak.crypto.SignatureProvider; +import org.keycloak.crypto.SignatureSignerContext; +import org.keycloak.crypto.SignatureVerifierContext; +import org.keycloak.jose.jws.JWSBuilder; +import org.keycloak.models.KeycloakContext; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvider; +import org.keycloak.protocol.oid4vc.model.JwtCNonce; +import org.keycloak.representations.JsonWebToken; +import org.keycloak.saml.RandomSecret; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * @author Pascal Knüppel */ diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidator.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidator.java index eec1442c905..ec5f18ce17d 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidator.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidator.java @@ -17,8 +17,15 @@ package org.keycloak.protocol.oid4vc.issuance.keybinding; -import com.fasterxml.jackson.core.type.TypeReference; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + import org.keycloak.common.VerificationException; import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.jose.jwk.JWK; @@ -39,14 +46,8 @@ import org.keycloak.protocol.oid4vc.model.SupportedProofTypeData; import org.keycloak.representations.AccessToken; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; +import com.fasterxml.jackson.core.type.TypeReference; +import org.jboss.logging.Logger; /** * Validates the conformance and authenticity of presented JWT proofs. diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidatorFactory.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidatorFactory.java index 41e9eebe181..b33df337fef 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidatorFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/JwtProofValidatorFactory.java @@ -17,11 +17,11 @@ package org.keycloak.protocol.oid4vc.issuance.keybinding; +import java.util.Map; + import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oid4vc.model.ProofType; -import java.util.Map; - public class JwtProofValidatorFactory implements ProofValidatorFactory { @Override diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/ProofValidator.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/ProofValidator.java index 6211598510f..a69973b0534 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/ProofValidator.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/ProofValidator.java @@ -17,13 +17,13 @@ package org.keycloak.protocol.oid4vc.issuance.keybinding; +import java.util.List; + import org.keycloak.jose.jwk.JWK; import org.keycloak.protocol.oid4vc.issuance.VCIssuanceContext; import org.keycloak.protocol.oid4vc.issuance.VCIssuerException; import org.keycloak.provider.Provider; -import java.util.List; - public interface ProofValidator extends Provider { @Override diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/ProofValidatorSpi.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/ProofValidatorSpi.java index c0f4a554297..4a487d042fb 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/ProofValidatorSpi.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/ProofValidatorSpi.java @@ -47,4 +47,3 @@ public class ProofValidatorSpi implements Spi { return ProofValidatorFactory.class; } } - diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/StaticAttestationKeyResolver.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/StaticAttestationKeyResolver.java index 6645f940bdb..407c49f54c0 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/StaticAttestationKeyResolver.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/keybinding/StaticAttestationKeyResolver.java @@ -17,10 +17,11 @@ package org.keycloak.protocol.oid4vc.issuance.keybinding; -import org.jboss.logging.Logger; +import java.util.Map; + import org.keycloak.jose.jwk.JWK; -import java.util.Map; +import org.jboss.logging.Logger; /** * Simple static implementation of AttestationKeyResolver using an in-memory trusted map. diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCContextMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCContextMapper.java index 1559990e514..d322422056e 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCContextMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCContextMapper.java @@ -17,13 +17,6 @@ package org.keycloak.protocol.oid4vc.issuance.mappers; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.ProtocolMapper; -import org.keycloak.protocol.oid4vc.model.VerifiableCredential; -import org.keycloak.provider.ProviderConfigProperty; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -31,6 +24,13 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.UserSessionModel; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.protocol.ProtocolMapper; +import org.keycloak.protocol.oid4vc.model.VerifiableCredential; +import org.keycloak.provider.ProviderConfigProperty; + /** * Allows to add the context to the credential subject * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCGeneratedIdMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCGeneratedIdMapper.java index 5ba3b591fc9..f5b8adbe6a3 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCGeneratedIdMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCGeneratedIdMapper.java @@ -17,20 +17,21 @@ package org.keycloak.protocol.oid4vc.issuance.mappers; -import org.apache.commons.collections4.ListUtils; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.ProtocolMapper; -import org.keycloak.protocol.oid4vc.model.VerifiableCredential; -import org.keycloak.provider.ProviderConfigProperty; - import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.UUID; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.UserSessionModel; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.protocol.ProtocolMapper; +import org.keycloak.protocol.oid4vc.model.VerifiableCredential; +import org.keycloak.provider.ProviderConfigProperty; + +import org.apache.commons.collections4.ListUtils; + /** * Adds a generated ID to the credential (as a configurable property). * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCIssuedAtTimeClaimMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCIssuedAtTimeClaimMapper.java index e86655b6863..e9933efa764 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCIssuedAtTimeClaimMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCIssuedAtTimeClaimMapper.java @@ -16,16 +16,6 @@ */ package org.keycloak.protocol.oid4vc.issuance.mappers; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.ProtocolMapper; -import org.keycloak.protocol.oid4vc.model.CredentialSubject; -import org.keycloak.protocol.oid4vc.model.VerifiableCredential; -import org.keycloak.provider.ProviderConfigProperty; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.time.Instant; import java.time.temporal.ChronoUnit; import java.util.ArrayList; @@ -34,6 +24,17 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.UserSessionModel; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.protocol.ProtocolMapper; +import org.keycloak.protocol.oid4vc.model.CredentialSubject; +import org.keycloak.protocol.oid4vc.model.VerifiableCredential; +import org.keycloak.provider.ProviderConfigProperty; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Map issuance date to the credential, under the default claim name "iat" *

diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCMapper.java index 4b060533d8a..ddc34b89506 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCMapper.java @@ -17,13 +17,19 @@ package org.keycloak.protocol.oid4vc.issuance.mappers; -import org.apache.commons.collections4.ListUtils; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Stream; + import org.keycloak.Config; -import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.constants.Oid4VciConstants; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.constants.Oid4VciConstants; +import org.keycloak.models.oid4vci.CredentialScopeModel; import org.keycloak.protocol.ProtocolMapper; import org.keycloak.protocol.oid4vc.OID4VCEnvironmentProviderFactory; import org.keycloak.protocol.oid4vc.OID4VCLoginProtocolFactory; @@ -31,12 +37,7 @@ import org.keycloak.protocol.oid4vc.model.Format; import org.keycloak.protocol.oid4vc.model.VerifiableCredential; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Stream; +import org.apache.commons.collections4.ListUtils; /** * Base class for OID4VC Mappers, to provide common configuration and functionality for all of them diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCStaticClaimMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCStaticClaimMapper.java index d6b3c149420..5083f96bc06 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCStaticClaimMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCStaticClaimMapper.java @@ -17,16 +17,16 @@ package org.keycloak.protocol.oid4vc.issuance.mappers; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.ProtocolMapper; import org.keycloak.protocol.oid4vc.model.VerifiableCredential; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - /** * Allows to add statically configured claims to the credential subject * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCSubjectIdMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCSubjectIdMapper.java index 1801cdcd1f8..aad54f815f4 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCSubjectIdMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCSubjectIdMapper.java @@ -17,7 +17,12 @@ package org.keycloak.protocol.oid4vc.issuance.mappers; -import org.apache.commons.collections4.ListUtils; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; @@ -26,11 +31,7 @@ import org.keycloak.protocol.oid4vc.OID4VCLoginProtocolFactory; import org.keycloak.protocol.oid4vc.model.VerifiableCredential; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import org.apache.commons.collections4.ListUtils; /** * Sets an ID for the credential, either randomly generated or statically configured diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCTargetRoleMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCTargetRoleMapper.java index e754e37e988..8607c2418a5 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCTargetRoleMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCTargetRoleMapper.java @@ -17,9 +17,15 @@ package org.keycloak.protocol.oid4vc.issuance.mappers; -import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.commons.collections4.ListUtils; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperContainerModel; @@ -35,14 +41,9 @@ import org.keycloak.protocol.oid4vc.model.VerifiableCredential; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.util.JsonSerialization; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.commons.collections4.ListUtils; +import org.jboss.logging.Logger; /** * Adds the users roles to the credential subject diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCTypeMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCTypeMapper.java index f532b304645..ab01c5f4192 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCTypeMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCTypeMapper.java @@ -17,13 +17,6 @@ package org.keycloak.protocol.oid4vc.issuance.mappers; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.ProtocolMapper; -import org.keycloak.protocol.oid4vc.model.VerifiableCredential; -import org.keycloak.provider.ProviderConfigProperty; - import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -31,6 +24,13 @@ import java.util.Map; import java.util.Optional; import java.util.Set; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.UserSessionModel; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.protocol.ProtocolMapper; +import org.keycloak.protocol.oid4vc.model.VerifiableCredential; +import org.keycloak.provider.ProviderConfigProperty; + /** * Allows to add types to the credential subject * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCUserAttributeMapper.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCUserAttributeMapper.java index 0df73f1c8ff..e27b2ed4e77 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCUserAttributeMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/mappers/OID4VCUserAttributeMapper.java @@ -17,6 +17,14 @@ package org.keycloak.protocol.oid4vc.issuance.mappers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserModel; @@ -27,14 +35,6 @@ import org.keycloak.protocol.oid4vc.OID4VCLoginProtocolFactory; import org.keycloak.protocol.oid4vc.model.VerifiableCredential; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; - /** * Allows to add user attributes to the credential subject * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/CredentialSignerSpi.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/CredentialSignerSpi.java index 1cfce61c74d..729fab5c1c7 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/CredentialSignerSpi.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/CredentialSignerSpi.java @@ -48,4 +48,3 @@ public class CredentialSignerSpi implements Spi { return CredentialSignerFactory.class; } } - diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/JwtCredentialSigner.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/JwtCredentialSigner.java index 53230ca93a0..fd5cacf8232 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/JwtCredentialSigner.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/JwtCredentialSigner.java @@ -17,12 +17,13 @@ package org.keycloak.protocol.oid4vc.issuance.signing; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.CredentialBody; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.JwtCredentialBody; import org.keycloak.protocol.oid4vc.model.CredentialBuildConfig; +import org.jboss.logging.Logger; + /** * {@link CredentialSigner} implementing the JWT_VC format. It returns the signed JWT-Credential as a String. *

diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/LDCredentialSigner.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/LDCredentialSigner.java index eaa5f070a94..e93f55b10b1 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/LDCredentialSigner.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/LDCredentialSigner.java @@ -17,7 +17,12 @@ package org.keycloak.protocol.oid4vc.issuance.signing; -import org.jboss.logging.Logger; +import java.time.Instant; +import java.util.Base64; +import java.util.Date; +import java.util.Objects; +import java.util.Optional; + import org.keycloak.crypto.SignatureSignerContext; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oid4vc.issuance.TimeProvider; @@ -29,11 +34,7 @@ import org.keycloak.protocol.oid4vc.model.CredentialBuildConfig; import org.keycloak.protocol.oid4vc.model.VerifiableCredential; import org.keycloak.protocol.oid4vc.model.vcdm.LdProof; -import java.time.Instant; -import java.util.Base64; -import java.util.Date; -import java.util.Objects; -import java.util.Optional; +import org.jboss.logging.Logger; /** * {@link CredentialSigner} implementing the JWT_VC format. It returns the signed JWT-Credential as a String. diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/SdJwtCredentialSigner.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/SdJwtCredentialSigner.java index 227d4b678a6..9785bee2a7c 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/SdJwtCredentialSigner.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/SdJwtCredentialSigner.java @@ -17,12 +17,13 @@ package org.keycloak.protocol.oid4vc.issuance.signing; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.CredentialBody; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.SdJwtCredentialBody; import org.keycloak.protocol.oid4vc.model.CredentialBuildConfig; +import org.jboss.logging.Logger; + /** * {@link CredentialSigner} implementing the SD_JWT_VC format. It returns the signed SD-JWT as a String. *

diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/vcdm/Ed255192018Suite.java b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/vcdm/Ed255192018Suite.java index 22ff84e489b..160a2306150 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/vcdm/Ed255192018Suite.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/issuance/signing/vcdm/Ed255192018Suite.java @@ -18,6 +18,22 @@ package org.keycloak.protocol.oid4vc.issuance.signing.vcdm; +import java.io.IOException; +import java.io.StringReader; +import java.io.StringWriter; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Optional; + +import jakarta.json.JsonObject; +import jakarta.json.JsonValue; + +import org.keycloak.crypto.SignatureSignerContext; +import org.keycloak.protocol.oid4vc.issuance.signing.CredentialSignerException; +import org.keycloak.protocol.oid4vc.model.VerifiableCredential; +import org.keycloak.util.JsonSerialization; + import com.apicatalog.jsonld.JsonLd; import com.apicatalog.jsonld.JsonLdError; import com.apicatalog.jsonld.document.JsonDocument; @@ -32,20 +48,6 @@ import com.apicatalog.rdf.io.error.RdfWriterException; import com.apicatalog.rdf.io.error.UnsupportedContentException; import com.fasterxml.jackson.core.JsonProcessingException; import io.setl.rdf.normalization.RdfNormalize; -import jakarta.json.JsonObject; -import jakarta.json.JsonValue; -import org.keycloak.crypto.SignatureSignerContext; -import org.keycloak.protocol.oid4vc.issuance.signing.CredentialSignerException; -import org.keycloak.protocol.oid4vc.model.VerifiableCredential; -import org.keycloak.util.JsonSerialization; - -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Optional; /** * Implementation of an LD-Crypto Suite for Ed25519Signature2018 diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/AuthorizationDetail.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/AuthorizationDetail.java index 2c35ce60bdb..8696b468be2 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/AuthorizationDetail.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/AuthorizationDetail.java @@ -16,15 +16,15 @@ */ package org.keycloak.protocol.oid4vc.model; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; -import java.util.Map; -import java.util.HashMap; - /** * Represents an authorization_details object in the Token Request as per OID4VCI. * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/Claim.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/Claim.java index e4f77b0df9f..b7c5bd54f5b 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/Claim.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/Claim.java @@ -16,12 +16,9 @@ */ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; +import java.util.List; +import java.util.Optional; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.oid4vci.Oid4vcProtocolMapperModel; import org.keycloak.protocol.ProtocolMapper; @@ -29,8 +26,12 @@ import org.keycloak.protocol.oid4vc.issuance.mappers.OID4VCMapper; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; -import java.util.List; -import java.util.Optional; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; /** * Holding metadata on a claim of verifiable credential. diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/ClaimDisplay.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/ClaimDisplay.java index 7fc2baed97d..b28bdb3ddec 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/ClaimDisplay.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/ClaimDisplay.java @@ -16,12 +16,13 @@ */ package org.keycloak.protocol.oid4vc.model; +import java.util.Objects; + +import org.keycloak.util.JsonSerialization; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; -import org.keycloak.util.JsonSerialization; - -import java.util.Objects; /** * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/Claims.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/Claims.java index ab295899c84..1cd148fa1fa 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/Claims.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/Claims.java @@ -16,14 +16,14 @@ */ package org.keycloak.protocol.oid4vc.model; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.util.ArrayList; import java.util.Optional; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.util.JsonSerialization; + /** * @author Francis Pouatcha */ diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/ClaimsDescription.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/ClaimsDescription.java index 477099991d5..df7cca440b8 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/ClaimsDescription.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/ClaimsDescription.java @@ -16,10 +16,10 @@ */ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Represents a claims description object as used in authorization details. * A claims description object defines the requirements for the claims that the Wallet diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialBuildConfig.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialBuildConfig.java index 504944538b1..b92b6961b7d 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialBuildConfig.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialBuildConfig.java @@ -17,14 +17,14 @@ package org.keycloak.protocol.oid4vc.model; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvider; - import java.util.List; import java.util.Objects; import java.util.Optional; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvider; + /** * Define credential-specific configurations for its builder. * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialDefinition.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialDefinition.java index bc21ae23384..f74db49839d 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialDefinition.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialDefinition.java @@ -16,14 +16,15 @@ */ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.models.oid4vci.CredentialScopeModel; - import java.util.ArrayList; import java.util.List; import java.util.Optional; +import org.keycloak.models.oid4vci.CredentialScopeModel; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Pojo to represent a CredentialDefinition for internal handling * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialIssuer.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialIssuer.java index 1d4cf44bcfd..c071f2123a1 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialIssuer.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialIssuer.java @@ -17,14 +17,14 @@ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Represents a credentials issuer according to the OID4VCI Credentials Issuer Metadata * {@see https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0-15.html#name-credential-issuer-metadata} diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialMetadata.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialMetadata.java index 199e5e8ed26..cdde0645075 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialMetadata.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialMetadata.java @@ -16,12 +16,13 @@ */ package org.keycloak.protocol.oid4vc.model; +import java.util.List; + +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.oid4vci.CredentialScopeModel; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.keycloak.models.KeycloakSession; - -import java.util.List; /** * Represents credential_metadata as defined in the OID4VCI specification. diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialRequest.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialRequest.java index 51a52470b8f..0ca3baeba66 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialRequest.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialRequest.java @@ -17,17 +17,18 @@ package org.keycloak.protocol.oid4vc.model; +import java.util.Map; +import java.util.Optional; + +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.util.JsonSerialization; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.util.JsonSerialization; - -import java.util.Map; -import java.util.Optional; /** * Represents a CredentialRequest according to OID4VCI diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialRequestEncryptionMetadata.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialRequestEncryptionMetadata.java index a300aaa5266..60b3007a4bf 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialRequestEncryptionMetadata.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialRequestEncryptionMetadata.java @@ -17,11 +17,12 @@ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import org.keycloak.jose.jwk.JSONWebKeySet; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Represents the credential_request_encryption metadata for an OID4VCI Credential Issuer. diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponse.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponse.java index 629bf4f96b6..60f8775943e 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponse.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponse.java @@ -17,12 +17,12 @@ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.ArrayList; import java.util.List; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Represents a CredentialResponse according to the OID4VCI Spec * {@see https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0.html#name-credential-response} diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponseEncryption.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponseEncryption.java index d2332a51549..99e6a594340 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponseEncryption.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponseEncryption.java @@ -17,9 +17,10 @@ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonInclude; import org.keycloak.jose.jwk.JWK; +import com.fasterxml.jackson.annotation.JsonInclude; + /** * Represents the credential_response_encryption object in a Credential Request. * {@see https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0.html#name-credential-request} diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponseEncryptionMetadata.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponseEncryptionMetadata.java index 0113b4ab5e2..fc686ff1868 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponseEncryptionMetadata.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialResponseEncryptionMetadata.java @@ -17,11 +17,11 @@ package org.keycloak.protocol.oid4vc.model; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - /** * Represents the credential_response_encryption metadata for an OID4VCI Credential Issuer. * @see https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0-16.html#name-credential-issuer-metadata-p diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialSubject.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialSubject.java index c0eae569e99..1c9fb6fd2db 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialSubject.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialSubject.java @@ -17,14 +17,14 @@ package org.keycloak.protocol.oid4vc.model; +import java.util.HashMap; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import java.util.HashMap; -import java.util.Map; - /** * Pojo to represent a CredentialSubject for internal handling * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialsOffer.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialsOffer.java index 957d0e188c1..00298e1ab5a 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialsOffer.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/CredentialsOffer.java @@ -17,13 +17,13 @@ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.Collections; import java.util.List; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Represents a CredentialsOffer according to the OID4VCI Spec * {@see https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0.html#name-credential-offer} diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/DiVpProof.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/DiVpProof.java index c521bf1a223..235154e53d8 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/DiVpProof.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/DiVpProof.java @@ -17,11 +17,11 @@ package org.keycloak.protocol.oid4vc.model; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - /** * W3C Verifiable Presentation as defined by [VC_DATA_2.0] or [VC_DATA] secured using Data Integrity [VC_Data_Integrity]. * Used as a proof type in OID4VCI (Section F.2). diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/DisplayObject.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/DisplayObject.java index ba5eeb55a09..626ed422e01 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/DisplayObject.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/DisplayObject.java @@ -16,22 +16,23 @@ */ package org.keycloak.protocol.oid4vc.model; +import java.io.IOException; +import java.util.List; +import java.util.Objects; + +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.util.JsonSerialization; +import org.keycloak.utils.StringUtil; + import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.keycloak.util.JsonSerialization; -import org.keycloak.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.util.List; -import java.util.Objects; - /** * Represents a DisplayObject, as used in the OID4VCI Credentials Issuer Metadata * {@see https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0.html#name-credential-issuer-metadata} diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/JWTVCIssuerMetadata.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/JWTVCIssuerMetadata.java index a89bc83981e..177e6aa340f 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/JWTVCIssuerMetadata.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/JWTVCIssuerMetadata.java @@ -16,9 +16,10 @@ */ package org.keycloak.protocol.oid4vc.model; +import org.keycloak.jose.jwk.JSONWebKeySet; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.jose.jwk.JSONWebKeySet; /** * JWT VC Issuer metadata for endpoint /.well-known/jwt-vc-issuer diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/JwtCNonce.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/JwtCNonce.java index e3b8af17529..db110ae9cb1 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/JwtCNonce.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/JwtCNonce.java @@ -18,9 +18,10 @@ package org.keycloak.protocol.oid4vc.model; +import org.keycloak.representations.JsonWebToken; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.representations.JsonWebToken; /** * @author Pascal Knüppel diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/KeyAttestationJwtBody.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/KeyAttestationJwtBody.java index 82e3972a2a6..0947ae5b539 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/KeyAttestationJwtBody.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/KeyAttestationJwtBody.java @@ -17,13 +17,14 @@ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.keycloak.jose.jwk.JWK; - import java.util.List; import java.util.Map; +import org.keycloak.jose.jwk.JWK; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Represents the JWT payload for a key attestation as per OID4VCI specification. * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/KeyAttestationsRequired.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/KeyAttestationsRequired.java index 7dbe0d625d3..759324a9425 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/KeyAttestationsRequired.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/KeyAttestationsRequired.java @@ -17,12 +17,12 @@ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.List; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Key attestation requirements on key storage and user authentication's attack resistance. * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/OfferUriType.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/OfferUriType.java index 7c7431c913b..b25eb71f791 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/OfferUriType.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/OfferUriType.java @@ -17,10 +17,10 @@ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonCreator; - import java.util.Optional; +import com.fasterxml.jackson.annotation.JsonCreator; + /** * Type of credential offer uri to be returned. * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/PreAuthorizedCode.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/PreAuthorizedCode.java index 54b42b5dd71..97f38d7fee1 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/PreAuthorizedCode.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/PreAuthorizedCode.java @@ -17,11 +17,11 @@ package org.keycloak.protocol.oid4vc.model; +import java.util.Objects; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.Objects; - /** * Represents a pre-authorized grant, as used by the Credential Offer in OID4VCI * {@see https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0.html#name-credential-offer} diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/PreAuthorizedGrant.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/PreAuthorizedGrant.java index 0c4b0bf710e..b7c727ec01e 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/PreAuthorizedGrant.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/PreAuthorizedGrant.java @@ -17,11 +17,12 @@ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Objects; + import org.keycloak.protocol.oidc.grants.PreAuthorizedCodeGrantTypeFactory; -import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; /** * Container for the pre-authorized code to be used in a Credential Offer diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypeJWT.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypeJWT.java index cf923e37fcd..d1f096d49a7 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypeJWT.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypeJWT.java @@ -16,12 +16,12 @@ */ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.List; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * See: https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0.html#name-jwt-proof-type * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypeMetadata.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypeMetadata.java index 2529bd197a4..f985a244800 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypeMetadata.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypeMetadata.java @@ -17,12 +17,12 @@ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.List; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Metadata describing proof types supported by the Credential Issuer. * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypesSupported.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypesSupported.java index 9cc6364448a..0ef563f299e 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypesSupported.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/ProofTypesSupported.java @@ -16,19 +16,20 @@ */ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonInclude; -import org.keycloak.models.KeycloakSession; -import org.keycloak.protocol.oid4vc.issuance.keybinding.ProofValidator; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; +import org.keycloak.models.KeycloakSession; +import org.keycloak.protocol.oid4vc.issuance.keybinding.ProofValidator; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonInclude; + /** * See: https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0.html#name-proof-types * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/Proofs.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/Proofs.java index 13bc0a8189f..5185d9d9d2c 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/Proofs.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/Proofs.java @@ -17,11 +17,11 @@ package org.keycloak.protocol.oid4vc.model; +import java.util.List; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; - /** * Proofs object for Credential Request in OID4VCI (Section 8.2). * Contains arrays of different proof types (jwt, di_vp, attestation). diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/Role.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/Role.java index 6fc16d71fa7..79a5a502c9d 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/Role.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/Role.java @@ -17,12 +17,12 @@ package org.keycloak.protocol.oid4vc.model; -import org.keycloak.protocol.oid4vc.issuance.mappers.OID4VCTargetRoleMapper; - import java.util.Collections; import java.util.Objects; import java.util.Set; +import org.keycloak.protocol.oid4vc.issuance.mappers.OID4VCTargetRoleMapper; + /** * Pojo representation of a role to be added by the {@link OID4VCTargetRoleMapper} * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/SupportedCredentialConfiguration.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/SupportedCredentialConfiguration.java index a15132ac5b8..b1aeb43cd25 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/SupportedCredentialConfiguration.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/SupportedCredentialConfiguration.java @@ -16,18 +16,19 @@ */ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.commons.collections4.ListUtils; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.keycloak.models.KeycloakSession; - import java.util.Collections; import java.util.List; import java.util.Objects; import java.util.Optional; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.oid4vci.CredentialScopeModel; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.commons.collections4.ListUtils; + /** * A supported credential, as used in the Credentials Issuer Metadata in OID4VCI * {@see https://openid.net/specs/openid-4-verifiable-credential-issuance-1_0.html#name-credential-issuer-metadata} diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/SupportedProofTypeData.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/SupportedProofTypeData.java index b02b7f8fb1a..de4659f076e 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/SupportedProofTypeData.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/SupportedProofTypeData.java @@ -16,12 +16,12 @@ */ package org.keycloak.protocol.oid4vc.model; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonInclude; - import java.util.List; import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Represents the supported proof type data for a given proof type in the OpenID for Verifiable Credential Issuance. * diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/VerifiableCredential.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/VerifiableCredential.java index 2717df7ba6a..70726cbf0fa 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/VerifiableCredential.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/VerifiableCredential.java @@ -17,6 +17,18 @@ package org.keycloak.protocol.oid4vc.model; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.time.Instant; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + +import org.keycloak.util.JsonSerialization; + import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -29,17 +41,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; -import org.keycloak.util.JsonSerialization; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.time.Instant; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; /** * Pojo to represent a VerifiableCredential for internal handling diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/model/vcdm/LdProof.java b/services/src/main/java/org/keycloak/protocol/oid4vc/model/vcdm/LdProof.java index cd72df0730d..d963f1f2b0e 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/model/vcdm/LdProof.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/model/vcdm/LdProof.java @@ -18,15 +18,15 @@ package org.keycloak.protocol.oid4vc.model.vcdm; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - /** * Pojo to represent a linked-data proof * {@see https://www.w3.org/TR/vc-data-model} diff --git a/services/src/main/java/org/keycloak/protocol/oid4vc/utils/ClaimsPathPointer.java b/services/src/main/java/org/keycloak/protocol/oid4vc/utils/ClaimsPathPointer.java index f45112a9f57..b5265839a69 100644 --- a/services/src/main/java/org/keycloak/protocol/oid4vc/utils/ClaimsPathPointer.java +++ b/services/src/main/java/org/keycloak/protocol/oid4vc/utils/ClaimsPathPointer.java @@ -16,15 +16,16 @@ */ package org.keycloak.protocol.oid4vc.utils; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + import org.keycloak.protocol.oid4vc.model.ClaimsDescription; import org.keycloak.utils.StringUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; -import java.util.Objects; +import org.jboss.logging.Logger; /** * Utility class for handling claims path pointers. diff --git a/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java index 8dbb9eef330..591cab20562 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/AccessTokenIntrospectionProvider.java @@ -17,9 +17,10 @@ */ package org.keycloak.protocol.oidc; -import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.ws.rs.core.HttpHeaders; -import org.jboss.logging.Logger; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; @@ -45,8 +46,8 @@ import org.keycloak.tracing.TracingAttributes; import org.keycloak.tracing.TracingProvider; import org.keycloak.util.JsonSerialization; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.jboss.logging.Logger; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/protocol/oidc/BackchannelLogoutResponse.java b/services/src/main/java/org/keycloak/protocol/oidc/BackchannelLogoutResponse.java index 2710f604954..daab6522354 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/BackchannelLogoutResponse.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/BackchannelLogoutResponse.java @@ -46,4 +46,3 @@ public class BackchannelLogoutResponse { } } } - diff --git a/services/src/main/java/org/keycloak/protocol/oidc/FrontChannelLogoutHandler.java b/services/src/main/java/org/keycloak/protocol/oidc/FrontChannelLogoutHandler.java index f292aa89c0e..3c38237adec 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/FrontChannelLogoutHandler.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/FrontChannelLogoutHandler.java @@ -3,8 +3,10 @@ package org.keycloak.protocol.oidc; import java.net.URI; import java.util.ArrayList; import java.util.List; + import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.headers.SecurityHeadersProvider; import org.keycloak.models.AuthenticatedClientSessionModel; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCAdvancedConfigWrapper.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCAdvancedConfigWrapper.java index c240d8a89e3..8b59f90fbf3 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCAdvancedConfigWrapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCAdvancedConfigWrapper.java @@ -17,8 +17,11 @@ package org.keycloak.protocol.oidc; -import static org.keycloak.protocol.oidc.OIDCConfigAttributes.USE_RFC9068_ACCESS_TOKEN_HEADER_TYPE; -import static org.keycloak.protocol.oidc.OIDCConfigAttributes.USE_LOWER_CASE_IN_TOKEN_RESPONSE; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; import org.keycloak.authentication.authenticators.client.X509ClientAuthenticator; import org.keycloak.models.ClientModel; @@ -26,11 +29,8 @@ import org.keycloak.models.Constants; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.utils.StringUtil; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; +import static org.keycloak.protocol.oidc.OIDCConfigAttributes.USE_LOWER_CASE_IN_TOKEN_RESPONSE; +import static org.keycloak.protocol.oidc.OIDCConfigAttributes.USE_RFC9068_ACCESS_TOKEN_HEADER_TYPE; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientDescriptionConverter.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientDescriptionConverter.java index 6eb0c61f3b1..380c5ce8fda 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientDescriptionConverter.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientDescriptionConverter.java @@ -17,6 +17,8 @@ package org.keycloak.protocol.oidc; +import java.io.IOException; + import org.keycloak.exportimport.ClientDescriptionConverter; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.idm.ClientRepresentation; @@ -24,8 +26,6 @@ import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.services.clientregistration.oidc.DescriptionConverter; import org.keycloak.util.JsonSerialization; -import java.io.IOException; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientSecretConfigWrapper.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientSecretConfigWrapper.java index 577d9279828..89223c377c0 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientSecretConfigWrapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCClientSecretConfigWrapper.java @@ -7,8 +7,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import org.keycloak.common.util.Time; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSecretConstants; @@ -16,6 +14,9 @@ import org.keycloak.models.delegate.ClientModelLazyDelegate; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.utils.StringUtil; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + import static org.keycloak.models.ClientSecretConstants.CLIENT_ROTATED_SECRET; import static org.keycloak.models.ClientSecretConstants.CLIENT_ROTATED_SECRET_CREATION_TIME; import static org.keycloak.models.ClientSecretConstants.CLIENT_ROTATED_SECRET_EXPIRATION_TIME; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocol.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocol.java index 29cdc11a301..2eb53f2a446 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocol.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocol.java @@ -16,11 +16,15 @@ */ package org.keycloak.protocol.oidc; +import java.io.IOException; +import java.net.URI; +import java.util.Optional; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.TokenIdGenerator; @@ -63,9 +67,7 @@ import org.keycloak.services.managers.ResourceAdminManager; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.TokenUtil; -import java.io.IOException; -import java.net.URI; -import java.util.Optional; +import org.jboss.logging.Logger; import static org.keycloak.protocol.oidc.grants.device.DeviceGrantType.approveOAuth2DeviceAuthorization; import static org.keycloak.protocol.oidc.grants.device.DeviceGrantType.denyOAuth2DeviceAuthorization; 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 50e611158e3..e37f8dd5c9d 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,12 @@ */ package org.keycloak.protocol.oidc; -import org.jboss.logging.Logger; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.keycloak.Config; import org.keycloak.OAuth2Constants; import org.keycloak.common.Profile; @@ -33,6 +38,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.utils.DefaultClientScopes; import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.organization.protocol.mappers.oidc.OrganizationMembershipMapper; import org.keycloak.protocol.AbstractLoginProtocolFactory; import org.keycloak.protocol.LoginProtocol; import org.keycloak.protocol.oidc.mappers.AcrProtocolMapper; @@ -40,13 +46,12 @@ import org.keycloak.protocol.oidc.mappers.AddressMapper; import org.keycloak.protocol.oidc.mappers.AllowedWebOriginsProtocolMapper; import org.keycloak.protocol.oidc.mappers.AudienceResolveProtocolMapper; import org.keycloak.protocol.oidc.mappers.FullNameMapper; -import org.keycloak.organization.protocol.mappers.oidc.OrganizationMembershipMapper; +import org.keycloak.protocol.oidc.mappers.SubMapper; import org.keycloak.protocol.oidc.mappers.UserAttributeMapper; import org.keycloak.protocol.oidc.mappers.UserClientRoleMappingMapper; import org.keycloak.protocol.oidc.mappers.UserPropertyMapper; import org.keycloak.protocol.oidc.mappers.UserRealmRoleMappingMapper; import org.keycloak.protocol.oidc.mappers.UserSessionNoteMapper; -import org.keycloak.protocol.oidc.mappers.SubMapper; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.representations.IDToken; @@ -54,11 +59,7 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.ServicesLogger; import org.keycloak.services.managers.AuthenticationManager; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.jboss.logging.Logger; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_ID; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_USERNAME; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java index fe3fb4bb561..a328116ea05 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java @@ -17,12 +17,24 @@ package org.keycloak.protocol.oidc; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.http.HttpRequest; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.OAuthErrorException; import org.keycloak.common.ClientConnection; import org.keycloak.events.EventBuilder; import org.keycloak.forms.login.LoginFormsProvider; +import org.keycloak.http.HttpRequest; import org.keycloak.jose.jwk.JSONWebKeySet; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; @@ -41,18 +53,7 @@ import org.keycloak.services.cors.Cors; import org.keycloak.services.resources.RealmsResource; import org.keycloak.services.util.CacheControlUtil; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.OPTIONS; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; +import org.jboss.resteasy.reactive.NoCache; import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java index 64c59224cd0..22ac2a75dd0 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProvider.java @@ -17,6 +17,19 @@ package org.keycloak.protocol.oidc; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.ClientAuthenticator; import org.keycloak.authentication.ClientAuthenticatorFactory; @@ -56,19 +69,6 @@ import org.keycloak.urls.UrlType; import org.keycloak.util.JsonSerialization; import org.keycloak.wellknown.WellKnownProvider; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; - -import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProviderFactory.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProviderFactory.java index 3bf5a5cf1a7..bcfc8a56378 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProviderFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCWellKnownProviderFactory.java @@ -22,7 +22,6 @@ import java.io.InputStream; import java.util.List; import java.util.Map; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.common.util.FindFile; import org.keycloak.models.KeycloakSession; @@ -33,6 +32,8 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.wellknown.WellKnownProvider; import org.keycloak.wellknown.WellKnownProviderFactory; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/RefreshTokenIntrospectionProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/RefreshTokenIntrospectionProvider.java index b0e8d6b721d..2e33b8b28ae 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/RefreshTokenIntrospectionProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/RefreshTokenIntrospectionProvider.java @@ -17,7 +17,6 @@ */ package org.keycloak.protocol.oidc; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.events.Details; import org.keycloak.events.Errors; @@ -27,6 +26,8 @@ import org.keycloak.representations.RefreshToken; import org.keycloak.services.util.UserSessionUtil; import org.keycloak.util.TokenUtil; +import org.jboss.logging.Logger; + /** * @author Pedro Igor */ 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 d81dd18dd61..0bc8a4182a5 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/TokenManager.java @@ -17,30 +17,50 @@ package org.keycloak.protocol.oidc; +import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import org.jboss.logging.Logger; -import org.keycloak.models.IdentityProviderQuery; -import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; -import org.keycloak.common.Profile.Feature; -import org.keycloak.common.util.SecretGenerator; -import org.keycloak.http.HttpRequest; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.function.BiConsumer; +import java.util.function.BinaryOperator; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.function.Supplier; +import java.util.stream.Collector; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.TokenCategory; import org.keycloak.TokenVerifier; import org.keycloak.authentication.authenticators.util.AcrStore; import org.keycloak.broker.oidc.OIDCIdentityProvider; +import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.broker.provider.IdentityBrokerException; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; +import org.keycloak.common.Profile.Feature; import org.keycloak.common.VerificationException; +import org.keycloak.common.util.SecretGenerator; import org.keycloak.common.util.Time; import org.keycloak.crypto.HashProvider; import org.keycloak.crypto.SignatureProvider; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; +import org.keycloak.http.HttpRequest; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; import org.keycloak.jose.jws.crypto.HashUtils; @@ -50,6 +70,7 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.ClientSessionContext; import org.keycloak.models.Constants; +import org.keycloak.models.IdentityProviderQuery; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; @@ -61,25 +82,25 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.models.UserSessionProvider; import org.keycloak.models.light.LightweightUserAdapter; import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.models.utils.SessionExpirationUtils; import org.keycloak.models.utils.RoleUtils; +import org.keycloak.models.utils.SessionExpirationUtils; import org.keycloak.organization.protocol.mappers.oidc.OrganizationMembershipMapper; import org.keycloak.organization.protocol.mappers.oidc.OrganizationScope; import org.keycloak.protocol.ProtocolMapper; import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.protocol.oidc.encode.AccessTokenContext; import org.keycloak.protocol.oidc.encode.TokenContextEncoderProvider; -import org.keycloak.protocol.oidc.mappers.TokenIntrospectionTokenMapper; import org.keycloak.protocol.oidc.mappers.OIDCAccessTokenMapper; import org.keycloak.protocol.oidc.mappers.OIDCAccessTokenResponseMapper; import org.keycloak.protocol.oidc.mappers.OIDCIDTokenMapper; +import org.keycloak.protocol.oidc.mappers.TokenIntrospectionTokenMapper; import org.keycloak.protocol.oidc.mappers.UserInfoTokenMapper; -import org.keycloak.rar.AuthorizationDetails; -import org.keycloak.representations.AuthorizationDetailsJSONRepresentation; -import org.keycloak.rar.AuthorizationRequestContext; import org.keycloak.protocol.oidc.utils.OIDCResponseType; +import org.keycloak.rar.AuthorizationDetails; +import org.keycloak.rar.AuthorizationRequestContext; import org.keycloak.representations.AccessToken; import org.keycloak.representations.AccessTokenResponse; +import org.keycloak.representations.AuthorizationDetailsJSONRepresentation; import org.keycloak.representations.IDToken; import org.keycloak.representations.JsonWebToken; import org.keycloak.representations.LogoutToken; @@ -102,27 +123,7 @@ import org.keycloak.tracing.TracingAttributes; import org.keycloak.tracing.TracingProvider; import org.keycloak.util.TokenUtil; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; -import java.util.function.BinaryOperator; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.function.Supplier; -import java.util.stream.Collector; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; +import org.jboss.logging.Logger; import static org.keycloak.OAuth2Constants.ORGANIZATION; import static org.keycloak.models.light.LightweightUserAdapter.isLightweightUser; 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 7dd4f8e004a..e765cd79a81 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 @@ -17,7 +17,18 @@ package org.keycloak.protocol.oidc.endpoints; -import org.jboss.logging.Logger; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.common.Profile; @@ -38,8 +49,8 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.endpoints.request.AuthorizationEndpointRequest; import org.keycloak.protocol.oidc.endpoints.request.AuthorizationEndpointRequestParserProcessor; import org.keycloak.protocol.oidc.endpoints.request.RequestUriType; -import org.keycloak.protocol.oidc.utils.AcrUtils; import org.keycloak.protocol.oidc.grants.device.endpoints.DeviceEndpoint; +import org.keycloak.protocol.oidc.utils.AcrUtils; import org.keycloak.protocol.oidc.utils.OIDCRedirectUriBuilder; import org.keycloak.protocol.oidc.utils.OIDCResponseMode; import org.keycloak.protocol.oidc.utils.OIDCResponseType; @@ -56,17 +67,7 @@ import org.keycloak.services.util.LocaleUtil; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.TokenUtil; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - -import java.util.List; -import java.util.Map; -import java.util.function.BiConsumer; +import org.jboss.logging.Logger; import static org.keycloak.protocol.oidc.par.endpoints.ParEndpoint.PAR_DPOP_PROOF_JKT; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpointChecker.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpointChecker.java index cf089fef87a..eba0bfdbf9c 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpointChecker.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/AuthorizationEndpointChecker.java @@ -24,7 +24,6 @@ import java.util.regex.Pattern; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.common.Profile; @@ -55,6 +54,8 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.TokenUtil; import org.keycloak.utils.StringUtil; +import org.jboss.logging.Logger; + /** * Implements some checks typical for OIDC Authorization Endpoint. Useful to consolidate various checks on single place to avoid duplicated * code logic in different contexts (OIDC Authorization Endpoint triggered from browser, PAR) diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java index 1109c62ec93..506acb835c5 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/IframeUtil.java @@ -17,15 +17,16 @@ package org.keycloak.protocol.oidc.endpoints; +import java.util.function.Supplier; + +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.Response; + import org.keycloak.common.Version; import org.keycloak.headers.SecurityHeadersProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.services.util.CacheControlUtil; -import jakarta.ws.rs.core.CacheControl; -import jakarta.ws.rs.core.Response; -import java.util.function.Supplier; - public class IframeUtil { public static Response returnIframeFromResources(String fileName, String version, KeycloakSession session) { 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 3b4b6c6f56b..764ebcc29b4 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LoginStatusIframeEndpoint.java @@ -17,7 +17,16 @@ package org.keycloak.protocol.oidc.endpoints; -import org.jboss.logging.Logger; +import java.util.HashMap; +import java.util.Set; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.util.UriUtils; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -27,17 +36,9 @@ import org.keycloak.services.Urls; import org.keycloak.urls.UrlType; import org.keycloak.utils.FreemarkerUtils; import org.keycloak.utils.MediaType; - -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; import org.keycloak.utils.SecureContextResolver; -import java.util.HashMap; -import java.util.Set; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen 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 9ae665190ee..4649b3f72ce 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 @@ -17,13 +17,24 @@ package org.keycloak.protocol.oidc.endpoints; -import static org.keycloak.models.UserSessionModel.State.LOGGED_OUT; -import static org.keycloak.models.UserSessionModel.State.LOGGING_OUT; -import static org.keycloak.services.resources.LoginActionsService.SESSION_CODE; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.http.HttpRequest; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.TokenVerifier; @@ -35,6 +46,7 @@ import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.headers.SecurityHeadersProvider; +import org.keycloak.http.HttpRequest; import org.keycloak.locale.LocaleSelectorProvider; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; @@ -76,24 +88,12 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.TokenUtil; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.OPTIONS; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; +import static org.keycloak.models.UserSessionModel.State.LOGGED_OUT; +import static org.keycloak.models.UserSessionModel.State.LOGGING_OUT; +import static org.keycloak.services.resources.LoginActionsService.SESSION_CODE; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java index 54a2dd96dcc..140a4b3bb47 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/ThirdPartyCookiesIframeEndpoint.java @@ -17,15 +17,15 @@ package org.keycloak.protocol.oidc.endpoints; -import org.keycloak.models.KeycloakSession; -import org.keycloak.utils.MediaType; - import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; +import org.keycloak.models.KeycloakSession; +import org.keycloak.utils.MediaType; + import static org.keycloak.protocol.oidc.endpoints.IframeUtil.returnIframeFromResources; /** 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 025bc68433f..ef2cc21baf6 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenEndpoint.java @@ -17,6 +17,10 @@ package org.keycloak.protocol.oidc.endpoints; +import java.io.IOException; +import java.util.Map; +import javax.xml.namespace.QName; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.OPTIONS; import jakarta.ws.rs.POST; @@ -27,7 +31,7 @@ import jakarta.ws.rs.core.MultivaluedHashMap; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.jboss.logging.Logger; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.common.ClientConnection; @@ -56,13 +60,11 @@ import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.services.CorsErrorResponseException; import org.keycloak.services.cors.Cors; import org.keycloak.services.util.DPoPUtil; + +import org.jboss.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; -import javax.xml.namespace.QName; -import java.io.IOException; -import java.util.Map; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java index 9c4e13b7c34..28208aaeb42 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java @@ -16,13 +16,21 @@ */ package org.keycloak.protocol.oidc.endpoints; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.events.Details; -import org.keycloak.http.HttpRequest; +import java.util.List; + +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.common.ClientConnection; +import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; +import org.keycloak.http.HttpRequest; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -33,14 +41,7 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.TokenIntrospectContext; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; - -import java.util.List; +import org.jboss.resteasy.reactive.NoCache; /** * A token introspection endpoint based on RFC-7662. diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenRevocationEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenRevocationEndpoint.java index a3e0ff1ec3b..8c69f82bce7 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenRevocationEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenRevocationEndpoint.java @@ -29,6 +29,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; + import org.keycloak.OAuthErrorException; import org.keycloak.common.ClientConnection; import org.keycloak.common.util.Time; 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 d7ff231dd50..1189cfa7abf 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 @@ -16,15 +16,27 @@ */ package org.keycloak.protocol.oidc.endpoints; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.http.HttpRequest; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.security.Key; +import java.util.Map; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.TokenCategory; import org.keycloak.TokenVerifier; import org.keycloak.common.ClientConnection; import org.keycloak.common.VerificationException; -import org.keycloak.crypto.ContentEncryptionProvider; import org.keycloak.crypto.CekManagementProvider; +import org.keycloak.crypto.ContentEncryptionProvider; import org.keycloak.crypto.KeyWrapper; import org.keycloak.crypto.SignatureProvider; import org.keycloak.crypto.SignatureSignerContext; @@ -33,6 +45,7 @@ import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; +import org.keycloak.http.HttpRequest; import org.keycloak.jose.jwe.JWEException; import org.keycloak.jose.jwe.alg.JWEAlgorithmProvider; import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; @@ -65,19 +78,7 @@ import org.keycloak.util.TokenUtil; import org.keycloak.utils.MediaType; import org.keycloak.utils.OAuth2Error; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.OPTIONS; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.MultivaluedMap; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.security.Key; -import java.util.Map; +import org.jboss.resteasy.reactive.NoCache; /** * @author pedroigor diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequest.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequest.java index 9de8517e218..cf540fefcc8 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequest.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequest.java @@ -17,12 +17,12 @@ package org.keycloak.protocol.oidc.endpoints.request; -import org.keycloak.protocol.ClientData; -import org.keycloak.rar.AuthorizationRequestContext; - import java.util.HashMap; import java.util.Map; +import org.keycloak.protocol.ClientData; +import org.keycloak.rar.AuthorizationRequestContext; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequestParserProcessor.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequestParserProcessor.java index e3248493949..c476ca2a0ca 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequestParserProcessor.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthorizationEndpointRequestParserProcessor.java @@ -17,7 +17,12 @@ package org.keycloak.protocol.oidc.endpoints.request; -import org.jboss.logging.Logger; +import java.util.HashSet; +import java.util.List; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.common.Profile; import org.keycloak.connections.httpclient.HttpClientProvider; @@ -37,10 +42,7 @@ import org.keycloak.services.messages.Messages; import org.keycloak.services.util.AuthorizationContextUtil; import org.keycloak.util.TokenUtil; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.util.HashSet; -import java.util.List; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointQueryStringParser.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointQueryStringParser.java index 81fc286f35b..1d60d11fad6 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointQueryStringParser.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointQueryStringParser.java @@ -17,13 +17,14 @@ package org.keycloak.protocol.oidc.endpoints.request; -import jakarta.ws.rs.core.MultivaluedMap; - import java.util.Set; -import org.jboss.logging.Logger; +import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.models.KeycloakSession; +import org.jboss.logging.Logger; + /** * Parse the parameters from request queryString * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointRequestObjectParser.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointRequestObjectParser.java index c9ea65134b6..c8d04df81fd 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointRequestObjectParser.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointRequestObjectParser.java @@ -16,13 +16,12 @@ */ package org.keycloak.protocol.oidc.endpoints.request; -import com.fasterxml.jackson.databind.JsonNode; import java.util.HashSet; import java.util.Set; import java.util.function.BiConsumer; -import org.keycloak.jose.JOSEHeader; import org.keycloak.jose.JOSE; +import org.keycloak.jose.JOSEHeader; import org.keycloak.jose.jwe.JWE; import org.keycloak.jose.jwe.JWEHeader; import org.keycloak.jose.jws.JWSInput; @@ -31,6 +30,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; import org.keycloak.protocol.oidc.OIDCLoginProtocol; +import com.fasterxml.jackson.databind.JsonNode; + /** * Parse the parameters from OIDC "request" object * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointRequestParser.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointRequestParser.java index 5863bc069d0..d6a02a4d661 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointRequestParser.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/request/AuthzEndpointRequestParser.java @@ -17,7 +17,12 @@ package org.keycloak.protocol.oidc.endpoints.request; -import org.jboss.logging.Logger; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.constants.AdapterConstants; @@ -28,11 +33,7 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.OIDCProviderConfig; import org.keycloak.services.ErrorResponseException; -import jakarta.ws.rs.core.Response; - -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import org.jboss.logging.Logger; /** * This endpoint parser supports, per default, up to diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/AuthorizationCodeGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/AuthorizationCodeGrantType.java index dfa155ee7de..a1d4b32c3ab 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/AuthorizationCodeGrantType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/AuthorizationCodeGrantType.java @@ -17,13 +17,11 @@ package org.keycloak.protocol.oidc.grants; -import jakarta.ws.rs.core.Response; - import java.util.List; import java.util.function.Supplier; import java.util.stream.Stream; -import org.jboss.logging.Logger; +import jakarta.ws.rs.core.Response; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; @@ -36,20 +34,23 @@ import org.keycloak.models.ClientScopeModel; import org.keycloak.models.ClientSessionContext; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.oidc.rar.AuthorizationDetailsResponse; -import org.keycloak.services.CorsErrorResponseException; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.TokenManager; +import org.keycloak.protocol.oidc.rar.AuthorizationDetailsResponse; import org.keycloak.protocol.oidc.utils.OAuth2Code; import org.keycloak.protocol.oidc.utils.OAuth2CodeParser; import org.keycloak.protocol.oidc.utils.PkceUtils; import org.keycloak.representations.AccessTokenResponse; +import org.keycloak.services.CorsErrorResponseException; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.TokenRequestContext; import org.keycloak.services.clientpolicy.context.TokenResponseContext; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.util.DPoPUtil; import org.keycloak.services.util.DefaultClientSessionContext; + +import org.jboss.logging.Logger; + import static org.keycloak.OAuth2Constants.AUTHORIZATION_DETAILS_PARAM; import static org.keycloak.models.Constants.AUTHORIZATION_DETAILS_RESPONSE; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ClientCredentialsGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ClientCredentialsGrantType.java index 24f756b1061..aa37366f8d8 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ClientCredentialsGrantType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ClientCredentialsGrantType.java @@ -19,8 +19,6 @@ package org.keycloak.protocol.oidc.grants; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; - import org.keycloak.OAuthErrorException; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.common.constants.ServiceAccountConstants; @@ -44,6 +42,8 @@ import org.keycloak.services.managers.UserSessionManager; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; +import org.jboss.logging.Logger; + import static org.keycloak.OAuth2Constants.AUTHORIZATION_DETAILS_PARAM; /** diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ClientCredentialsGrantTypeFactory.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ClientCredentialsGrantTypeFactory.java index 84ee1f43d13..9163e8c6263 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ClientCredentialsGrantTypeFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ClientCredentialsGrantTypeFactory.java @@ -18,7 +18,6 @@ package org.keycloak.protocol.oidc.grants; import org.keycloak.Config; - import org.keycloak.OAuth2Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/JWTAuthorizationGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/JWTAuthorizationGrantType.java index 52bfec29964..486b5fbeb88 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/JWTAuthorizationGrantType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/JWTAuthorizationGrantType.java @@ -17,6 +17,8 @@ package org.keycloak.protocol.oidc.grants; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -43,8 +45,6 @@ import org.keycloak.services.resources.IdentityBrokerService; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; -import jakarta.ws.rs.core.Response; - public class JWTAuthorizationGrantType extends OAuth2GrantTypeBase { @Override diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/OAuth2GrantTypeBase.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/OAuth2GrantTypeBase.java index a89bcac88d3..600184835d4 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/OAuth2GrantTypeBase.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/OAuth2GrantTypeBase.java @@ -17,11 +17,16 @@ package org.keycloak.protocol.oidc.grants; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.Function; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.AuthenticationProcessor; @@ -45,6 +50,8 @@ import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; import org.keycloak.protocol.oidc.TokenManager; import org.keycloak.protocol.oidc.encode.AccessTokenContext; import org.keycloak.protocol.oidc.encode.TokenContextEncoderProvider; +import org.keycloak.protocol.oidc.rar.AuthorizationDetailsProcessor; +import org.keycloak.protocol.oidc.rar.AuthorizationDetailsResponse; import org.keycloak.protocol.oidc.utils.AuthorizeClientUtil; import org.keycloak.rar.AuthorizationRequestContext; import org.keycloak.representations.AccessToken; @@ -57,13 +64,8 @@ import org.keycloak.services.cors.Cors; import org.keycloak.services.util.AuthorizationContextUtil; import org.keycloak.services.util.MtlsHoKTokenUtil; import org.keycloak.util.TokenUtil; -import org.keycloak.protocol.oidc.rar.AuthorizationDetailsProcessor; -import org.keycloak.protocol.oidc.rar.AuthorizationDetailsResponse; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Function; +import org.jboss.logging.Logger; import static org.keycloak.OAuth2Constants.AUTHORIZATION_DETAILS_PARAM; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/PermissionGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/PermissionGrantType.java index 7b9c01ee894..f98b0f0055c 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/PermissionGrantType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/PermissionGrantType.java @@ -17,11 +17,11 @@ package org.keycloak.protocol.oidc.grants; +import java.util.List; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import java.util.List; - import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.authorization.AuthorizationProvider; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/PreAuthorizedCodeGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/PreAuthorizedCodeGrantType.java index 50de12e2c03..9722084e8a6 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/PreAuthorizedCodeGrantType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/PreAuthorizedCodeGrantType.java @@ -17,8 +17,11 @@ package org.keycloak.protocol.oidc.grants; +import java.util.List; +import java.util.UUID; + import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.common.util.SecretGenerator; @@ -29,18 +32,17 @@ import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientSessionContext; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; -import org.keycloak.protocol.oidc.rar.AuthorizationDetailsResponse; -import org.keycloak.services.CorsErrorResponseException; import org.keycloak.protocol.oidc.TokenManager; +import org.keycloak.protocol.oidc.rar.AuthorizationDetailsResponse; import org.keycloak.protocol.oidc.utils.OAuth2Code; import org.keycloak.protocol.oidc.utils.OAuth2CodeParser; import org.keycloak.representations.AccessToken; import org.keycloak.representations.AccessTokenResponse; +import org.keycloak.services.CorsErrorResponseException; import org.keycloak.services.util.DefaultClientSessionContext; import org.keycloak.utils.MediaType; -import java.util.List; -import java.util.UUID; +import org.jboss.logging.Logger; import static org.keycloak.OAuth2Constants.AUTHORIZATION_DETAILS_PARAM; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/RefreshTokenGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/RefreshTokenGrantType.java index be24d858546..5ef6e484b3d 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/RefreshTokenGrantType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/RefreshTokenGrantType.java @@ -20,8 +20,6 @@ package org.keycloak.protocol.oidc.grants; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; - import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.events.Details; @@ -37,6 +35,8 @@ import org.keycloak.services.clientpolicy.context.TokenRefreshContext; import org.keycloak.services.clientpolicy.context.TokenRefreshResponseContext; import org.keycloak.services.util.MtlsHoKTokenUtil; +import org.jboss.logging.Logger; + /** * OAuth 2.0 Refresh Token Grant * https://datatracker.ietf.org/doc/html/rfc6749#section-6 diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ResourceOwnerPasswordCredentialsGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ResourceOwnerPasswordCredentialsGrantType.java index 7b17b7a621d..1aaf03b757c 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ResourceOwnerPasswordCredentialsGrantType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ResourceOwnerPasswordCredentialsGrantType.java @@ -20,8 +20,6 @@ package org.keycloak.protocol.oidc.grants; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; - import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.AuthenticationProcessor; @@ -49,6 +47,8 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.TokenUtil; +import org.jboss.logging.Logger; + /** * OAuth 2.0 Resource Owner Password Credentials Grant * https://datatracker.ietf.org/doc/html/rfc6749#section-4.3 diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/CibaGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/CibaGrantType.java index 680250361f9..4f6d1ee9f54 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/CibaGrantType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/CibaGrantType.java @@ -23,7 +23,6 @@ import java.util.Map; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.common.util.Time; @@ -57,6 +56,8 @@ import org.keycloak.services.util.DefaultClientSessionContext; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; +import org.jboss.logging.Logger; + /** * OpenID Connect Client-Initiated Backchannel Authentication Flow * https://openid.net/specs/openid-client-initiated-backchannel-authentication-core-1_0.html#rfc.section.10.1 diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/AuthenticationChannelRequest.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/AuthenticationChannelRequest.java index 5bea9932d9a..d640387dd83 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/AuthenticationChannelRequest.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/AuthenticationChannelRequest.java @@ -17,14 +17,15 @@ package org.keycloak.protocol.oidc.grants.ciba.channel; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.OAuth2Constants; import org.keycloak.protocol.oidc.grants.ciba.CibaGrantType; -import java.util.HashMap; -import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; +import com.fasterxml.jackson.annotation.JsonProperty; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/AuthenticationChannelResponse.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/AuthenticationChannelResponse.java index 26c0c1678c7..b781d589b07 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/AuthenticationChannelResponse.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/AuthenticationChannelResponse.java @@ -19,12 +19,12 @@ package org.keycloak.protocol.oidc.grants.ciba.channel; -import com.fasterxml.jackson.annotation.JsonAnyGetter; -import com.fasterxml.jackson.annotation.JsonAnySetter; - import java.util.HashMap; import java.util.Map; +import com.fasterxml.jackson.annotation.JsonAnyGetter; +import com.fasterxml.jackson.annotation.JsonAnySetter; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/CIBAAuthenticationRequest.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/CIBAAuthenticationRequest.java index b6255346939..b9779c4f12c 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/CIBAAuthenticationRequest.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/CIBAAuthenticationRequest.java @@ -17,10 +17,9 @@ */ package org.keycloak.protocol.oidc.grants.ciba.channel; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; import java.nio.charset.StandardCharsets; import javax.crypto.SecretKey; + import org.keycloak.OAuth2Constants; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyUse; @@ -40,6 +39,9 @@ import org.keycloak.representations.JsonWebToken; import org.keycloak.services.Urls; import org.keycloak.util.TokenUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; + /** *

Represents an authentication request sent by a consumption device (CD). * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/HttpAuthenticationChannelProviderFactory.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/HttpAuthenticationChannelProviderFactory.java index db282391612..c0c53f2e95d 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/HttpAuthenticationChannelProviderFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/channel/HttpAuthenticationChannelProviderFactory.java @@ -18,6 +18,7 @@ package org.keycloak.protocol.oidc.grants.ciba.channel; import java.util.List; + import org.keycloak.Config.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaAuthenticationRequestSigningAlgorithmExecutor.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaAuthenticationRequestSigningAlgorithmExecutor.java index 2fba8b9bc44..f14110fa676 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaAuthenticationRequestSigningAlgorithmExecutor.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaAuthenticationRequestSigningAlgorithmExecutor.java @@ -21,8 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.jboss.logging.Logger; - import org.keycloak.OAuthErrorException; import org.keycloak.crypto.Algorithm; import org.keycloak.models.CibaConfig; @@ -39,6 +37,7 @@ import org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProvider; import org.keycloak.services.clientpolicy.executor.FapiConstant; import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSessionEnforceExecutor.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSessionEnforceExecutor.java index 821602529a1..a503ed2957e 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSessionEnforceExecutor.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSessionEnforceExecutor.java @@ -19,7 +19,6 @@ package org.keycloak.protocol.oidc.grants.ciba.clientpolicy.executor; import jakarta.ws.rs.core.MultivaluedMap; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.grants.ciba.clientpolicy.context.BackchannelAuthenticationRequestContext; @@ -29,6 +28,8 @@ import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProvider; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSignedAuthenticationRequestExecutor.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSignedAuthenticationRequestExecutor.java index e40611dbb82..e7c05b319ac 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSignedAuthenticationRequestExecutor.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/clientpolicy/executor/SecureCibaSignedAuthenticationRequestExecutor.java @@ -23,7 +23,6 @@ import java.util.Optional; import jakarta.ws.rs.core.MultivaluedMap; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.common.util.Time; import org.keycloak.models.ClientModel; @@ -40,6 +39,7 @@ import org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProvider; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java index 440ab34a333..7cb351ccf73 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java @@ -16,14 +16,23 @@ */ package org.keycloak.protocol.oidc.grants.ciba.endpoints; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.http.HttpRequest; +import java.io.IOException; +import java.util.Map; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuthErrorException; import org.keycloak.TokenVerifier; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; +import org.keycloak.http.HttpRequest; import org.keycloak.http.simple.SimpleHttp; import org.keycloak.http.simple.SimpleHttpRequest; import org.keycloak.models.CibaConfig; @@ -39,16 +48,8 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.Urls; import org.keycloak.services.managers.AppAuthManager; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; - -import java.io.IOException; -import java.util.Map; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.CANCELLED; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java index 4b47c80f020..98eb18be5a2 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java @@ -16,15 +16,24 @@ */ package org.keycloak.protocol.oidc.grants.ciba.endpoints; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.events.Details; -import org.keycloak.http.HttpRequest; +import java.util.Collections; +import java.util.Optional; +import java.util.regex.Pattern; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; +import org.keycloak.events.Details; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; +import org.keycloak.http.HttpRequest; import org.keycloak.models.CibaConfig; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -46,17 +55,9 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.util.JsonSerialization; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - -import java.util.Collections; -import java.util.Optional; -import java.util.regex.Pattern; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import static org.keycloak.protocol.oidc.OIDCLoginProtocol.ID_TOKEN_HINT; import static org.keycloak.protocol.oidc.OIDCLoginProtocol.LOGIN_HINT_PARAM; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/ClientNotificationEndpointRequest.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/ClientNotificationEndpointRequest.java index 376b0446f06..c1d4f763058 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/ClientNotificationEndpointRequest.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/ClientNotificationEndpointRequest.java @@ -18,9 +18,10 @@ package org.keycloak.protocol.oidc.grants.ciba.endpoints; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.protocol.oidc.grants.ciba.CibaGrantType; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestBodyParser.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestBodyParser.java index 767e2c27872..d1131f6dc41 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestBodyParser.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestBodyParser.java @@ -17,10 +17,10 @@ */ package org.keycloak.protocol.oidc.grants.ciba.endpoints.request; -import jakarta.ws.rs.core.MultivaluedMap; - import java.util.Set; +import jakarta.ws.rs.core.MultivaluedMap; + /** * Parse the parameters from request body * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParser.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParser.java index 6d734d2f806..97427f06d2a 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParser.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParser.java @@ -18,14 +18,15 @@ package org.keycloak.protocol.oidc.grants.ciba.endpoints.request; -import org.jboss.logging.Logger; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.keycloak.OAuth2Constants; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.grants.ciba.CibaGrantType; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParserProcessor.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParserProcessor.java index 2d4bd9c0347..974ff48b12e 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParserProcessor.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointRequestParserProcessor.java @@ -18,6 +18,12 @@ package org.keycloak.protocol.oidc.grants.ciba.endpoints.request; +import java.util.HashSet; +import java.util.List; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuthErrorException; import org.keycloak.connections.httpclient.HttpClientProvider; import org.keycloak.events.EventBuilder; @@ -29,11 +35,6 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.utils.RedirectUtils; import org.keycloak.services.ErrorResponseException; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.util.HashSet; -import java.util.List; - /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointSignedRequestParser.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointSignedRequestParser.java index 4baef290d40..c9be61667e4 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointSignedRequestParser.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/request/BackchannelAuthenticationEndpointSignedRequestParser.java @@ -18,7 +18,6 @@ package org.keycloak.protocol.oidc.grants.ciba.endpoints.request; -import com.fasterxml.jackson.databind.JsonNode; import java.util.HashSet; import java.util.Set; @@ -33,6 +32,8 @@ import org.keycloak.models.CibaConfig; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; +import com.fasterxml.jackson.databind.JsonNode; + /** * Parse the parameters from OIDC "request" object * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantType.java index da8fc0ad0d9..9f3e60617f0 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantType.java @@ -23,6 +23,7 @@ import java.util.Map; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.events.Details; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantTypeFactory.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantTypeFactory.java index 6b2f226513c..4f3f02c822c 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantTypeFactory.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/DeviceGrantTypeFactory.java @@ -18,14 +18,14 @@ package org.keycloak.protocol.oidc.grants.device; +import org.keycloak.Config; import org.keycloak.OAuth2Constants; import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; -import org.keycloak.provider.EnvironmentDependentProviderFactory; -import org.keycloak.protocol.oidc.grants.OAuth2GrantType; -import org.keycloak.Config; import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.protocol.oidc.grants.OAuth2GrantType; import org.keycloak.protocol.oidc.grants.OAuth2GrantTypeFactory; +import org.keycloak.provider.EnvironmentDependentProviderFactory; /** * Factory for OAuth 2.0 Device Authorization Grant diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/endpoints/DeviceEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/endpoints/DeviceEndpoint.java index 6123c7d56f5..c4905d543e9 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/device/endpoints/DeviceEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/device/endpoints/DeviceEndpoint.java @@ -17,8 +17,19 @@ package org.keycloak.protocol.oidc.grants.device.endpoints; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; +import java.util.Map; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuthErrorException; import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.SecretGenerator; @@ -27,6 +38,7 @@ import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; import org.keycloak.forms.login.LoginFormsProvider; +import org.keycloak.http.HttpRequest; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; @@ -58,18 +70,7 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.OPTIONS; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - -import java.util.Map; +import org.jboss.logging.Logger; import static org.keycloak.protocol.oidc.grants.device.DeviceGrantType.OAUTH2_DEVICE_USER_CODE; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCClientInstallation.java b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCClientInstallation.java index f39b101670d..c88cb9cbe2e 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCClientInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCClientInstallation.java @@ -17,6 +17,15 @@ package org.keycloak.protocol.oidc.installation; +import java.io.IOException; +import java.net.URI; +import java.util.Iterator; +import java.util.Map; +import java.util.Objects; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.authentication.ClientAuthenticator; import org.keycloak.authentication.ClientAuthenticatorFactory; @@ -35,14 +44,6 @@ import org.keycloak.representations.adapters.config.PolicyEnforcerConfig; import org.keycloak.services.managers.ClientManager; import org.keycloak.util.JsonSerialization; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.io.IOException; -import java.net.URI; -import java.util.Iterator; -import java.util.Map; -import java.util.Objects; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientCliInstallation.java b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientCliInstallation.java index f429379755a..e224fee76b5 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientCliInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientCliInstallation.java @@ -17,7 +17,12 @@ package org.keycloak.protocol.oidc.installation; -import static org.keycloak.protocol.util.ClientCliInstallationUtil.quote; +import java.net.URI; +import java.util.Map; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -26,10 +31,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.Map; +import static org.keycloak.protocol.util.ClientCliInstallationUtil.quote; public class KeycloakOIDCJbossSubsystemClientCliInstallation implements ClientInstallationProvider { diff --git a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientInstallation.java b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientInstallation.java index 0a2ad944b22..1ff2e74b412 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/installation/KeycloakOIDCJbossSubsystemClientInstallation.java @@ -17,6 +17,12 @@ package org.keycloak.protocol.oidc.installation; +import java.net.URI; +import java.util.Map; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -25,11 +31,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ @@ -135,4 +136,3 @@ public class KeycloakOIDCJbossSubsystemClientInstallation implements ClientInsta return MediaType.APPLICATION_XML; } } - diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AbstractPairwiseSubMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AbstractPairwiseSubMapper.java index e46a424ec2f..5054575e18f 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AbstractPairwiseSubMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AbstractPairwiseSubMapper.java @@ -1,5 +1,8 @@ package org.keycloak.protocol.oidc.mappers; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSessionContext; import org.keycloak.models.KeycloakSession; @@ -15,9 +18,6 @@ import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; import org.keycloak.representations.LogoutToken; -import java.util.LinkedList; -import java.util.List; - /** * Set the 'sub' claim to pairwise . * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AbstractUserRoleMappingMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AbstractUserRoleMappingMapper.java index 6b9491f74f9..83b83b561c9 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AbstractUserRoleMappingMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AbstractUserRoleMappingMapper.java @@ -17,13 +17,6 @@ package org.keycloak.protocol.oidc.mappers; -import static org.keycloak.utils.JsonUtils.splitClaimPath; - -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.protocol.ProtocolMapperUtils; -import org.keycloak.representations.AccessToken; -import org.keycloak.representations.IDToken; - import java.util.Collection; import java.util.HashMap; import java.util.List; @@ -33,6 +26,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.keycloak.models.ProtocolMapperModel; +import org.keycloak.protocol.ProtocolMapperUtils; +import org.keycloak.representations.AccessToken; +import org.keycloak.representations.IDToken; + +import static org.keycloak.utils.JsonUtils.splitClaimPath; + /** * Base class for mapping of user role mappings to an ID and Access Token claim. * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AcrProtocolMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AcrProtocolMapper.java index 65626375ae0..55b525b97fa 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AcrProtocolMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AcrProtocolMapper.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.authentication.authenticators.util.LoAUtil; import org.keycloak.common.Profile; @@ -40,6 +39,8 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.IDToken; import org.keycloak.services.managers.AuthenticationManager; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AddressMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AddressMapper.java index a35a9360cfc..9b3a7dffda8 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AddressMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AddressMapper.java @@ -17,6 +17,11 @@ package org.keycloak.protocol.oidc.mappers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; @@ -25,11 +30,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.AddressClaimSet; import org.keycloak.representations.IDToken; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AmrProtocolMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AmrProtocolMapper.java index eb6a57aa222..640ee1e3ae2 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/AmrProtocolMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/AmrProtocolMapper.java @@ -18,7 +18,11 @@ package org.keycloak.protocol.oidc.mappers; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.authenticators.util.AuthenticatorUtils; import org.keycloak.models.AuthenticatedClientSessionModel; @@ -33,10 +37,7 @@ import org.keycloak.protocol.oidc.utils.AmrUtils; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.IDToken; -import java.util.HashMap; -import java.util.Map; -import java.util.List; -import java.util.ArrayList; +import org.jboss.logging.Logger; /** * @author Ben Cresitello-Dittmar diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/ClaimsParameterWithValueIdTokenMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/ClaimsParameterWithValueIdTokenMapper.java index f865537150e..ad1b02aba29 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/ClaimsParameterWithValueIdTokenMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/ClaimsParameterWithValueIdTokenMapper.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jboss.logging.Logger; import org.keycloak.models.ClientSessionContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; @@ -35,6 +34,8 @@ import org.keycloak.representations.IDToken; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java index 3f3e73c83ef..505704196d9 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/FullNameMapper.java @@ -17,13 +17,6 @@ package org.keycloak.protocol.oidc.mappers; -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.UserModel; -import org.keycloak.models.UserSessionModel; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.representations.IDToken; - import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; @@ -31,6 +24,13 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import org.keycloak.models.ProtocolMapperModel; +import org.keycloak.models.UserModel; +import org.keycloak.models.UserSessionModel; +import org.keycloak.protocol.oidc.OIDCLoginProtocol; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.representations.IDToken; + /** * Set the 'name' claim to be first + last name. * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/GroupMembershipMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/GroupMembershipMapper.java index 27b71861711..5731f4c83e7 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/GroupMembershipMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/GroupMembershipMapper.java @@ -17,6 +17,13 @@ package org.keycloak.protocol.oidc.mappers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + import org.keycloak.models.GroupModel; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; @@ -26,13 +33,6 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.IDToken; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; - /** * Maps user group membership * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java index e36a4f2be1c..aa8aed98213 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedClaim.java @@ -17,6 +17,11 @@ package org.keycloak.protocol.oidc.mappers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.models.ClientSessionContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; @@ -26,11 +31,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.IDToken; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java index 7f1583900cb..ef5cfbddf34 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/HardcodedRole.java @@ -17,6 +17,11 @@ package org.keycloak.protocol.oidc.mappers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.models.ClientSessionContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; @@ -29,11 +34,6 @@ import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; import org.keycloak.utils.RoleResolveUtil; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * Add a role to a token * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/NonceBackwardsCompatibleMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/NonceBackwardsCompatibleMapper.java index 4c4aee27b7d..ed6351b9713 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/NonceBackwardsCompatibleMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/NonceBackwardsCompatibleMapper.java @@ -20,6 +20,7 @@ package org.keycloak.protocol.oidc.mappers; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.keycloak.Config; import org.keycloak.models.ClientSessionContext; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelper.java index 379d9b8e038..d0703ecf70d 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelper.java @@ -17,20 +17,6 @@ package org.keycloak.protocol.oidc.mappers; -import static org.keycloak.utils.JsonUtils.splitClaimPath; - -import com.fasterxml.jackson.databind.JsonNode; -import org.jboss.logging.Logger; -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.protocol.ProtocolMapper; -import org.keycloak.protocol.ProtocolMapperUtils; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.representations.AccessTokenResponse; -import org.keycloak.representations.IDToken; -import org.keycloak.services.ServicesLogger; -import org.keycloak.util.JsonSerialization; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -42,6 +28,21 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.keycloak.models.ProtocolMapperModel; +import org.keycloak.protocol.ProtocolMapper; +import org.keycloak.protocol.ProtocolMapperUtils; +import org.keycloak.protocol.oidc.OIDCLoginProtocol; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.representations.AccessTokenResponse; +import org.keycloak.representations.IDToken; +import org.keycloak.services.ServicesLogger; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; + +import static org.keycloak.utils.JsonUtils.splitClaimPath; + /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java index 7cb40f888a0..785ecca6409 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/RoleNameMapper.java @@ -17,6 +17,11 @@ package org.keycloak.protocol.oidc.mappers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.models.ClientSessionContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; @@ -29,11 +34,6 @@ import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; import org.keycloak.utils.RoleResolveUtil; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * Map an assigned role to a different position and name in the token * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/SHA256PairwiseSubMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/SHA256PairwiseSubMapper.java index bb261628870..4dce259f26b 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/SHA256PairwiseSubMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/SHA256PairwiseSubMapper.java @@ -1,16 +1,5 @@ package org.keycloak.protocol.oidc.mappers; -import org.jboss.logging.Logger; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ProtocolMapperContainerModel; -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.models.RealmModel; -import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.protocol.ProtocolMapperConfigException; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.representations.idm.ProtocolMapperRepresentation; - import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -21,6 +10,18 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.ProtocolMapperContainerModel; +import org.keycloak.models.ProtocolMapperModel; +import org.keycloak.models.RealmModel; +import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.protocol.ProtocolMapperConfigException; +import org.keycloak.protocol.oidc.OIDCLoginProtocol; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.representations.idm.ProtocolMapperRepresentation; + +import org.jboss.logging.Logger; + public class SHA256PairwiseSubMapper extends AbstractPairwiseSubMapper { public static final String PROVIDER_ID = "sha256"; private static final String HASH_ALGORITHM = "SHA-256"; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/ScriptBasedOIDCProtocolMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/ScriptBasedOIDCProtocolMapper.java index de8302c4dbe..6575ee626cb 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/ScriptBasedOIDCProtocolMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/ScriptBasedOIDCProtocolMapper.java @@ -17,7 +17,8 @@ package org.keycloak.protocol.oidc.mappers; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.models.ClientSessionContext; @@ -39,7 +40,7 @@ import org.keycloak.scripting.EvaluatableScriptAdapter; import org.keycloak.scripting.ScriptCompilationException; import org.keycloak.scripting.ScriptingProvider; -import java.util.List; +import org.jboss.logging.Logger; /** * OIDC {@link org.keycloak.protocol.ProtocolMapper} that uses a provided JavaScript fragment to compute the token claim value. diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/SessionStateMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/SessionStateMapper.java index 469b192483c..ca0714968cd 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/SessionStateMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/SessionStateMapper.java @@ -17,7 +17,10 @@ package org.keycloak.protocol.oidc.mappers; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import org.keycloak.models.ClientSessionContext; import org.keycloak.models.KeycloakSession; @@ -27,10 +30,7 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.IDToken; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Giuseppe Graziano diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/SubMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/SubMapper.java index d2671562970..c328b184fc8 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/SubMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/SubMapper.java @@ -17,7 +17,11 @@ package org.keycloak.protocol.oidc.mappers; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.models.ClientSessionContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; @@ -27,10 +31,7 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.IDToken; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Giuseppe Graziano diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserAttributeMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserAttributeMapper.java index 6a0d679685f..52c42c4c54a 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserAttributeMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserAttributeMapper.java @@ -17,6 +17,10 @@ package org.keycloak.protocol.oidc.mappers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; @@ -25,10 +29,6 @@ import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.IDToken; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - /** * Mappings UserModel.attribute to an ID Token claim. Token claim name can be a full qualified nested object name, * i.e. "address.country". This will create a nested diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserClientRoleMappingMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserClientRoleMappingMapper.java index 77c9532f20b..7b9e011a4d8 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserClientRoleMappingMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserClientRoleMappingMapper.java @@ -17,6 +17,10 @@ package org.keycloak.protocol.oidc.mappers; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import org.keycloak.models.ClientSessionContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; @@ -27,10 +31,6 @@ import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; import org.keycloak.utils.RoleResolveUtil; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - /** * Allows mapping of user client role mappings to an ID and Access Token claim. * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserPropertyMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserPropertyMapper.java index 6e4e6a94e45..9d33722cc7a 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserPropertyMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserPropertyMapper.java @@ -17,6 +17,9 @@ package org.keycloak.protocol.oidc.mappers; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; @@ -24,9 +27,6 @@ import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.IDToken; -import java.util.ArrayList; -import java.util.List; - /** * Mappings UserModel property (the property name of a getter method) to an ID Token claim. Token claim name can be a full qualified nested object name, * i.e. "address.country". This will create a nested diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserRealmRoleMappingMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserRealmRoleMappingMapper.java index 089426023ed..d85145ca9fc 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserRealmRoleMappingMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserRealmRoleMappingMapper.java @@ -17,6 +17,9 @@ package org.keycloak.protocol.oidc.mappers; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.models.ClientSessionContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; @@ -27,9 +30,6 @@ import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; import org.keycloak.utils.RoleResolveUtil; -import java.util.ArrayList; -import java.util.List; - /** * Allows mapping of user realm role mappings to an ID and Access Token claim. * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserSessionNoteMapper.java b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserSessionNoteMapper.java index 6833b83d53f..97c9255aeb7 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserSessionNoteMapper.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/mappers/UserSessionNoteMapper.java @@ -17,6 +17,11 @@ package org.keycloak.protocol.oidc.mappers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.models.ClientSessionContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; @@ -28,11 +33,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.representations.AccessTokenResponse; import org.keycloak.representations.IDToken; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * Mappings UserSessionModel.note to an ID Token claim. * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParEndpoint.java index d939a51ae49..99427f62e43 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/ParEndpoint.java @@ -17,14 +17,27 @@ package org.keycloak.protocol.oidc.par.endpoints; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; -import org.keycloak.events.Details; -import org.keycloak.http.HttpRequest; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.OAuthErrorException; import org.keycloak.common.Profile; +import org.keycloak.events.Details; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; import org.keycloak.headers.SecurityHeadersProvider; +import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakSession; import org.keycloak.models.SingleUseObjectProvider; import org.keycloak.protocol.oidc.OIDCLoginProtocol; @@ -40,21 +53,8 @@ import org.keycloak.services.cors.Cors; import org.keycloak.services.util.DPoPUtil; import org.keycloak.utils.ProfileHelper; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; - import static org.keycloak.protocol.oidc.OIDCLoginProtocol.REQUEST_URI_PARAM; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - /** * Pushed Authorization Request endpoint */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/request/AuthzEndpointParParser.java b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/request/AuthzEndpointParParser.java index a7714696c84..20c78174e7a 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/request/AuthzEndpointParParser.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/par/endpoints/request/AuthzEndpointParParser.java @@ -21,7 +21,6 @@ package org.keycloak.protocol.oidc.par.endpoints.request; import java.util.Map; import java.util.Set; -import org.jboss.logging.Logger; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -31,6 +30,8 @@ import org.keycloak.protocol.oidc.endpoints.request.AuthorizationEndpointRequest import org.keycloak.protocol.oidc.endpoints.request.AuthzEndpointRequestParser; import org.keycloak.protocol.oidc.par.endpoints.ParEndpoint; +import org.jboss.logging.Logger; + import static org.keycloak.protocol.oidc.par.endpoints.ParEndpoint.PAR_CREATED_TIME; import static org.keycloak.protocol.oidc.par.endpoints.ParEndpoint.PAR_DPOP_PROOF_JKT; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/rar/model/IntermediaryScopeRepresentation.java b/services/src/main/java/org/keycloak/protocol/oidc/rar/model/IntermediaryScopeRepresentation.java index c2b74b3724f..75768b666b2 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/rar/model/IntermediaryScopeRepresentation.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/rar/model/IntermediaryScopeRepresentation.java @@ -16,10 +16,10 @@ */ package org.keycloak.protocol.oidc.rar.model; -import org.keycloak.models.ClientScopeModel; - import java.util.Objects; +import org.keycloak.models.ClientScopeModel; + /** * @author Daniel Gozalo */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/rar/parsers/ClientScopeAuthorizationRequestParser.java b/services/src/main/java/org/keycloak/protocol/oidc/rar/parsers/ClientScopeAuthorizationRequestParser.java index 8716bf92fe8..60a6ce5fc94 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/rar/parsers/ClientScopeAuthorizationRequestParser.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/rar/parsers/ClientScopeAuthorizationRequestParser.java @@ -16,17 +16,6 @@ */ package org.keycloak.protocol.oidc.rar.parsers; -import org.jboss.logging.Logger; -import org.keycloak.models.ClientModel; -import org.keycloak.models.ClientScopeModel; -import org.keycloak.protocol.oidc.TokenManager; -import org.keycloak.protocol.oidc.rar.AuthorizationRequestParserProvider; -import org.keycloak.rar.AuthorizationRequestContext; -import org.keycloak.protocol.oidc.rar.model.IntermediaryScopeRepresentation; -import org.keycloak.rar.AuthorizationDetails; -import org.keycloak.representations.AuthorizationDetailsJSONRepresentation; -import org.keycloak.rar.AuthorizationRequestSource; - import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -37,6 +26,18 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; +import org.keycloak.models.ClientModel; +import org.keycloak.models.ClientScopeModel; +import org.keycloak.protocol.oidc.TokenManager; +import org.keycloak.protocol.oidc.rar.AuthorizationRequestParserProvider; +import org.keycloak.protocol.oidc.rar.model.IntermediaryScopeRepresentation; +import org.keycloak.rar.AuthorizationDetails; +import org.keycloak.rar.AuthorizationRequestContext; +import org.keycloak.rar.AuthorizationRequestSource; +import org.keycloak.representations.AuthorizationDetailsJSONRepresentation; + +import org.jboss.logging.Logger; + import static org.keycloak.representations.AuthorizationDetailsJSONRepresentation.DYNAMIC_SCOPE_RAR_TYPE; import static org.keycloak.representations.AuthorizationDetailsJSONRepresentation.STATIC_SCOPE_RAR_TYPE; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/AbstractTokenExchangeProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/AbstractTokenExchangeProvider.java index 0a8fbf6eff5..1b52f9b9056 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/AbstractTokenExchangeProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/AbstractTokenExchangeProvider.java @@ -18,8 +18,17 @@ */ package org.keycloak.protocol.oidc.tokenexchange; -import org.jboss.logging.Logger; -import org.keycloak.models.IdentityProviderQuery; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -41,6 +50,7 @@ import org.keycloak.models.ClientModel; import org.keycloak.models.FederatedIdentityModel; import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderQuery; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; @@ -65,20 +75,11 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.Booleans; +import org.jboss.logging.Logger; + import static org.keycloak.authentication.authenticators.util.AuthenticatorUtils.getDisabledByBruteForceEventError; import static org.keycloak.models.IdentityProviderType.EXCHANGE_EXTERNAL_TOKEN; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; - -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - /** * Base token exchange implementation. For now for both V1 and V2 token exchange (may change in the follow-up commits) * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/ExternalToInternalTokenExchangeProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/ExternalToInternalTokenExchangeProvider.java index c77b4f4d8ff..7570c3f307d 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/ExternalToInternalTokenExchangeProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/ExternalToInternalTokenExchangeProvider.java @@ -19,7 +19,11 @@ package org.keycloak.protocol.oidc.tokenexchange; +import java.util.Arrays; +import java.util.List; + import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -32,9 +36,6 @@ import org.keycloak.protocol.oidc.TokenExchangeContext; import org.keycloak.services.CorsErrorResponseException; import org.keycloak.services.managers.UserSessionManager; -import java.util.Arrays; -import java.util.List; - /** * Provider for external-internal token exchange * diff --git a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/StandardTokenExchangeProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/StandardTokenExchangeProvider.java index b7030dc9ed8..3ee90b6b3c0 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/StandardTokenExchangeProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/StandardTokenExchangeProvider.java @@ -19,12 +19,13 @@ package org.keycloak.protocol.oidc.tokenexchange; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; - import java.util.Arrays; import java.util.List; import java.util.Set; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.actiontoken.TokenUtils; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/V1TokenExchangeProvider.java b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/V1TokenExchangeProvider.java index 369ed4d7fcd..881aa220665 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/V1TokenExchangeProvider.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/tokenexchange/V1TokenExchangeProvider.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.common.ClientConnection; @@ -65,6 +65,8 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.TokenUtil; +import org.jboss.logging.Logger; + import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_CLIENT; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_ID; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_USERNAME; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/AcrUtils.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/AcrUtils.java index 9f5741fb5f7..4830d97c6ea 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/AcrUtils.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/AcrUtils.java @@ -17,7 +17,6 @@ package org.keycloak.protocol.oidc.utils; -import com.fasterxml.jackson.core.type.TypeReference; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -28,7 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.jboss.logging.Logger; import org.keycloak.authentication.authenticators.util.LoAUtil; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; @@ -38,6 +36,9 @@ import org.keycloak.representations.ClaimsRepresentation; import org.keycloak.representations.IDToken; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.core.type.TypeReference; +import org.jboss.logging.Logger; + public class AcrUtils { private static final Logger LOGGER = Logger.getLogger(AcrUtils.class); diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/AmrUtils.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/AmrUtils.java index b945fa6ab46..39e96708ae7 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/AmrUtils.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/AmrUtils.java @@ -17,15 +17,16 @@ package org.keycloak.protocol.oidc.utils; -import org.jboss.logging.Logger; -import org.keycloak.common.util.Time; -import org.keycloak.models.RealmModel; -import org.keycloak.models.Constants; - import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.keycloak.common.util.Time; +import org.keycloak.models.Constants; +import org.keycloak.models.RealmModel; + +import org.jboss.logging.Logger; + /** * @author Ben Cresitello-Dittmar * Utility for parsing authenticator method reference (AMR) values. diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/AuthorizeClientUtil.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/AuthorizeClientUtil.java index bd3b4d82fa1..2fd6f0f6247 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/AuthorizeClientUtil.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/AuthorizeClientUtil.java @@ -17,7 +17,11 @@ package org.keycloak.protocol.oidc.utils; -import org.jboss.logging.Logger; +import java.util.Map; + +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.authentication.ClientAuthenticator; import org.keycloak.authentication.ClientAuthenticatorFactory; @@ -32,9 +36,7 @@ import org.keycloak.services.CorsErrorResponseException; import org.keycloak.services.ErrorResponseException; import org.keycloak.services.cors.Cors; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.Response; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/JWKSHttpUtils.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/JWKSHttpUtils.java index a888276e8fa..6cd650b0b44 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/JWKSHttpUtils.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/JWKSHttpUtils.java @@ -17,13 +17,13 @@ package org.keycloak.protocol.oidc.utils; +import java.io.IOException; + import org.keycloak.connections.httpclient.HttpClientProvider; import org.keycloak.jose.jwk.JSONWebKeySet; import org.keycloak.models.KeycloakSession; import org.keycloak.util.JsonSerialization; -import java.io.IOException; - /** * * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/JWKSServerUtils.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/JWKSServerUtils.java index 40aa19f5a2e..bbcdd38bce0 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/JWKSServerUtils.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/JWKSServerUtils.java @@ -16,6 +16,12 @@ */ package org.keycloak.protocol.oidc.utils; +import java.security.cert.X509Certificate; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Optional; + import org.keycloak.crypto.KeyType; import org.keycloak.jose.jwk.JSONWebKeySet; import org.keycloak.jose.jwk.JWK; @@ -23,12 +29,6 @@ import org.keycloak.jose.jwk.JWKBuilder; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import java.security.cert.X509Certificate; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.Optional; - /** * * @author Francis Pouatcha diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/OAuth2CodeParser.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/OAuth2CodeParser.java index 321d78a4621..f697d61e2c7 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/OAuth2CodeParser.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/OAuth2CodeParser.java @@ -20,7 +20,6 @@ package org.keycloak.protocol.oidc.utils; import java.util.Map; import java.util.regex.Pattern; -import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.events.Details; import org.keycloak.events.EventBuilder; @@ -30,6 +29,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.SingleUseObjectProvider; import org.keycloak.models.UserSessionModel; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCRedirectUriBuilder.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCRedirectUriBuilder.java index 87bf9f3dcbe..1bd8c8932c6 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCRedirectUriBuilder.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCRedirectUriBuilder.java @@ -17,6 +17,13 @@ package org.keycloak.protocol.oidc.utils; +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.common.util.Encode; import org.keycloak.common.util.HtmlUtils; @@ -31,12 +38,6 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.representations.AuthorizationResponseToken; import org.keycloak.services.Urls; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; - /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCResponseType.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCResponseType.java index 0e5f5173aa4..38fce946bc5 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCResponseType.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/OIDCResponseType.java @@ -17,12 +17,12 @@ package org.keycloak.protocol.oidc.utils; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.keycloak.protocol.oidc.OIDCLoginProtocol; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/PairwiseSubMapperUtils.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/PairwiseSubMapperUtils.java index 75a86c885ba..698a1155cc9 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/PairwiseSubMapperUtils.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/PairwiseSubMapperUtils.java @@ -1,10 +1,5 @@ package org.keycloak.protocol.oidc.utils; -import org.jboss.logging.Logger; -import org.keycloak.protocol.oidc.mappers.AbstractPairwiseSubMapper; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.ProtocolMapperRepresentation; - import java.net.URI; import java.net.URISyntaxException; import java.util.Collection; @@ -15,6 +10,12 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.protocol.oidc.mappers.AbstractPairwiseSubMapper; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.ProtocolMapperRepresentation; + +import org.jboss.logging.Logger; + public class PairwiseSubMapperUtils { private static final Logger logger = Logger.getLogger(PairwiseSubMapperUtils.class); diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/PairwiseSubMapperValidator.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/PairwiseSubMapperValidator.java index 428cb9d66da..810be530f26 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/PairwiseSubMapperValidator.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/PairwiseSubMapperValidator.java @@ -1,13 +1,5 @@ package org.keycloak.protocol.oidc.utils; -import org.keycloak.connections.httpclient.HttpClientProvider; -import org.keycloak.models.ClientModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.protocol.ProtocolMapperConfigException; -import org.keycloak.protocol.oidc.mappers.PairwiseSubMapperHelper; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -16,6 +8,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.keycloak.connections.httpclient.HttpClientProvider; +import org.keycloak.models.ClientModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.ProtocolMapperModel; +import org.keycloak.protocol.ProtocolMapperConfigException; +import org.keycloak.protocol.oidc.mappers.PairwiseSubMapperHelper; +import org.keycloak.util.JsonSerialization; + /** * @author Martin Hardselius */ diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/PkceUtils.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/PkceUtils.java index 11e32babede..2f93d0fb090 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/PkceUtils.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/PkceUtils.java @@ -1,6 +1,11 @@ package org.keycloak.protocol.oidc.utils; -import org.jboss.logging.Logger; +import java.nio.charset.StandardCharsets; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.common.util.Base64Url; @@ -8,17 +13,13 @@ import org.keycloak.common.util.SecretGenerator; import org.keycloak.crypto.HashException; import org.keycloak.events.Details; import org.keycloak.events.Errors; +import org.keycloak.events.EventBuilder; import org.keycloak.jose.jws.crypto.HashUtils; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.services.CorsErrorResponseException; -import org.keycloak.events.EventBuilder; import org.keycloak.services.cors.Cors; -import java.nio.charset.StandardCharsets; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import jakarta.ws.rs.core.Response; +import org.jboss.logging.Logger; public class PkceUtils { diff --git a/services/src/main/java/org/keycloak/protocol/oidc/utils/RedirectUtils.java b/services/src/main/java/org/keycloak/protocol/oidc/utils/RedirectUtils.java index e2be2a83554..889d884d0c5 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/utils/RedirectUtils.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/utils/RedirectUtils.java @@ -17,7 +17,14 @@ package org.keycloak.protocol.oidc.utils; -import org.jboss.logging.Logger; +import java.net.URI; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import java.util.TreeSet; +import java.util.regex.Pattern; + import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.common.util.UriUtils; import org.keycloak.models.ClientModel; @@ -28,13 +35,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.services.Urls; import org.keycloak.services.util.ResolveRelative; -import java.net.URI; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; -import java.util.TreeSet; -import java.util.regex.Pattern; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen 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 aa23208ae34..6ebc8c86671 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 @@ -17,13 +17,13 @@ package org.keycloak.protocol.oidc.utils; +import java.util.HashSet; +import java.util.Set; + import org.keycloak.common.util.UriUtils; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; -import java.util.HashSet; -import java.util.Set; - /** * Created by st on 22.09.15. */ diff --git a/services/src/main/java/org/keycloak/protocol/saml/DefaultSamlArtifactResolver.java b/services/src/main/java/org/keycloak/protocol/saml/DefaultSamlArtifactResolver.java index d2c006ab006..63301578b50 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/DefaultSamlArtifactResolver.java +++ b/services/src/main/java/org/keycloak/protocol/saml/DefaultSamlArtifactResolver.java @@ -1,6 +1,11 @@ package org.keycloak.protocol.saml; -import org.jboss.logging.Logger; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.security.SecureRandom; +import java.util.Base64; +import java.util.Collections; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -8,11 +13,7 @@ import org.keycloak.protocol.saml.util.ArtifactBindingUtils; import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.utils.StringUtil; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.security.SecureRandom; -import java.util.Base64; -import java.util.Collections; +import org.jboss.logging.Logger; import static org.keycloak.protocol.saml.DefaultSamlArtifactResolverFactory.TYPE_CODE; import static org.keycloak.protocol.saml.SamlConfigAttributes.SAML_ARTIFACT_BINDING_IDENTIFIER; diff --git a/services/src/main/java/org/keycloak/protocol/saml/EntityDescriptorDescriptionConverter.java b/services/src/main/java/org/keycloak/protocol/saml/EntityDescriptorDescriptionConverter.java index 7f3ffa3db8e..7a6907a9000 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/EntityDescriptorDescriptionConverter.java +++ b/services/src/main/java/org/keycloak/protocol/saml/EntityDescriptorDescriptionConverter.java @@ -17,6 +17,16 @@ package org.keycloak.protocol.saml; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.security.cert.X509Certificate; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + import org.keycloak.Config; import org.keycloak.dom.saml.v2.metadata.EndpointType; import org.keycloak.dom.saml.v2.metadata.EntitiesDescriptorType; @@ -44,16 +54,6 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.core.parsers.saml.SAMLParser; import org.keycloak.saml.processing.core.saml.v2.util.SAMLMetadataUtil; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.security.cert.X509Certificate; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/protocol/saml/IDPMetadataDescriptor.java b/services/src/main/java/org/keycloak/protocol/saml/IDPMetadataDescriptor.java index 64871b91aca..27358a0fb87 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/IDPMetadataDescriptor.java +++ b/services/src/main/java/org/keycloak/protocol/saml/IDPMetadataDescriptor.java @@ -17,13 +17,6 @@ package org.keycloak.protocol.saml; -import org.keycloak.dom.saml.v2.metadata.EndpointType; -import org.keycloak.dom.saml.v2.metadata.EntityDescriptorType; -import org.keycloak.dom.saml.v2.metadata.IDPSSODescriptorType; -import org.keycloak.dom.saml.v2.metadata.IndexedEndpointType; -import org.keycloak.dom.saml.v2.metadata.KeyDescriptorType; -import org.keycloak.dom.saml.v2.metadata.KeyTypes; - import java.net.URI; import java.security.KeyPair; import java.security.PrivateKey; @@ -33,28 +26,35 @@ import java.util.concurrent.TimeUnit; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; - import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; + import org.keycloak.crypto.KeyWrapper; +import org.keycloak.dom.saml.v2.metadata.EndpointType; +import org.keycloak.dom.saml.v2.metadata.EntityDescriptorType; +import org.keycloak.dom.saml.v2.metadata.IDPSSODescriptorType; +import org.keycloak.dom.saml.v2.metadata.IndexedEndpointType; +import org.keycloak.dom.saml.v2.metadata.KeyDescriptorType; +import org.keycloak.dom.saml.v2.metadata.KeyTypes; import org.keycloak.saml.SignatureAlgorithm; -import org.keycloak.saml.common.exceptions.ProcessingException; 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.processing.core.saml.v2.util.SAMLMetadataUtil; + import org.w3c.dom.Document; import org.w3c.dom.Element; +import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.NAMEID_FORMAT_EMAIL; +import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.NAMEID_FORMAT_PERSISTENT; +import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.NAMEID_FORMAT_TRANSIENT; +import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.NAMEID_FORMAT_UNSPECIFIED; +import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.PROTOCOL_NSURI; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.SAML_HTTP_ARTIFACT_BINDING; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.SAML_HTTP_POST_BINDING; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.SAML_HTTP_REDIRECT_BINDING; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.SAML_SOAP_BINDING; -import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.NAMEID_FORMAT_PERSISTENT; -import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.NAMEID_FORMAT_TRANSIENT; -import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.NAMEID_FORMAT_UNSPECIFIED; -import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.NAMEID_FORMAT_EMAIL; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.XMLDSIG_NSURI; -import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.PROTOCOL_NSURI; /** * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/protocol/saml/JaxrsSAML2BindingBuilder.java b/services/src/main/java/org/keycloak/protocol/saml/JaxrsSAML2BindingBuilder.java index 61aa796f8b6..ec05cdecf0d 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/JaxrsSAML2BindingBuilder.java +++ b/services/src/main/java/org/keycloak/protocol/saml/JaxrsSAML2BindingBuilder.java @@ -17,6 +17,14 @@ package org.keycloak.protocol.saml; +import java.io.IOException; +import java.net.URI; + +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.saml.profile.util.Soap; @@ -24,14 +32,8 @@ import org.keycloak.saml.BaseSAML2BindingBuilder; import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.saml.common.exceptions.ConfigurationException; import org.keycloak.saml.common.exceptions.ProcessingException; -import org.w3c.dom.Document; -import jakarta.ws.rs.core.CacheControl; -import jakarta.ws.rs.core.MultivaluedHashMap; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.io.IOException; -import java.net.URI; +import org.w3c.dom.Document; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/protocol/saml/SAMLDecryptionKeysLocator.java b/services/src/main/java/org/keycloak/protocol/saml/SAMLDecryptionKeysLocator.java index 1e35a14e61e..f634a664671 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/SAMLDecryptionKeysLocator.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SAMLDecryptionKeysLocator.java @@ -19,19 +19,6 @@ package org.keycloak.protocol.saml; -import org.apache.xml.security.encryption.EncryptedData; -import org.apache.xml.security.encryption.EncryptedKey; -import org.apache.xml.security.encryption.EncryptionMethod; -import org.apache.xml.security.exceptions.XMLSecurityException; -import org.apache.xml.security.keys.KeyInfo; -import org.apache.xml.security.keys.content.KeyName; -import org.keycloak.common.util.DerUtils; -import org.keycloak.crypto.KeyUse; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.saml.processing.core.util.XMLEncryptionUtil; - import java.security.Key; import java.security.PrivateKey; import java.util.LinkedList; @@ -41,6 +28,20 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.keycloak.common.util.DerUtils; +import org.keycloak.crypto.KeyUse; +import org.keycloak.crypto.KeyWrapper; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.saml.processing.core.util.XMLEncryptionUtil; + +import org.apache.xml.security.encryption.EncryptedData; +import org.apache.xml.security.encryption.EncryptedKey; +import org.apache.xml.security.encryption.EncryptionMethod; +import org.apache.xml.security.exceptions.XMLSecurityException; +import org.apache.xml.security.keys.KeyInfo; +import org.apache.xml.security.keys.content.KeyName; + /** * This implementation locates the decryption keys within realm keys. * It filters realm keys based on algorithm provided within {@link EncryptedData} diff --git a/services/src/main/java/org/keycloak/protocol/saml/SAMLEncryptionAlgorithms.java b/services/src/main/java/org/keycloak/protocol/saml/SAMLEncryptionAlgorithms.java index 9f0d8b9ce4a..7ae1b11ad73 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/SAMLEncryptionAlgorithms.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SAMLEncryptionAlgorithms.java @@ -17,13 +17,14 @@ package org.keycloak.protocol.saml; -import org.apache.xml.security.encryption.XMLCipher; -import org.keycloak.crypto.Algorithm; - import java.util.Collections; import java.util.HashMap; import java.util.Map; +import org.keycloak.crypto.Algorithm; + +import org.apache.xml.security.encryption.XMLCipher; + /** * This enum provides mapping between Keycloak provided encryption algorithms and algorithms from xmlsec. * It is used to make sure we are using keys generated for given algorithm only with that algorithm. diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlAbstractMetadataPublicKeyLoader.java b/services/src/main/java/org/keycloak/protocol/saml/SamlAbstractMetadataPublicKeyLoader.java index 58a81e9d314..7fd64999a03 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlAbstractMetadataPublicKeyLoader.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlAbstractMetadataPublicKeyLoader.java @@ -28,7 +28,7 @@ import javax.xml.crypto.dsig.keyinfo.KeyName; import javax.xml.crypto.dsig.keyinfo.X509Data; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; -import org.jboss.logging.Logger; + import org.keycloak.common.util.Time; import org.keycloak.crypto.KeyUse; import org.keycloak.crypto.KeyWrapper; @@ -41,6 +41,8 @@ import org.keycloak.dom.saml.v2.metadata.SPSSODescriptorType; import org.keycloak.keys.PublicKeyLoader; import org.keycloak.saml.processing.core.saml.v2.util.SAMLMetadataUtil; import org.keycloak.saml.processing.core.util.XMLSignatureUtil; + +import org.jboss.logging.Logger; import org.w3c.dom.Element; /** diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlClient.java b/services/src/main/java/org/keycloak/protocol/saml/SamlClient.java index 4cba4bc55dc..ca4ed836a80 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlClient.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlClient.java @@ -17,7 +17,6 @@ package org.keycloak.protocol.saml; -import org.jboss.logging.Logger; import org.keycloak.models.ClientConfigResolver; import org.keycloak.models.ClientModel; import org.keycloak.protocol.saml.util.ArtifactBindingUtils; @@ -25,6 +24,8 @@ import org.keycloak.saml.SignatureAlgorithm; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.common.util.XmlKeyInfoKeyNameTransformer; +import org.jboss.logging.Logger; + /** * Configuration of a SAML-enabled client. * diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlMetadataKeyLocator.java b/services/src/main/java/org/keycloak/protocol/saml/SamlMetadataKeyLocator.java index f3daa7d23f0..176c05086f8 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlMetadataKeyLocator.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlMetadataKeyLocator.java @@ -22,6 +22,7 @@ import java.security.MessageDigest; import java.security.cert.CertificateException; import java.util.Iterator; import java.util.function.Predicate; + import org.keycloak.crypto.KeyUse; import org.keycloak.crypto.KeyWrapper; import org.keycloak.keys.PublicKeyLoader; diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlMetadataPublicKeyLoader.java b/services/src/main/java/org/keycloak/protocol/saml/SamlMetadataPublicKeyLoader.java index dcbba1e54cd..834fac8b1bb 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlMetadataPublicKeyLoader.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlMetadataPublicKeyLoader.java @@ -16,10 +16,11 @@ */ package org.keycloak.protocol.saml; -import org.jboss.logging.Logger; import org.keycloak.connections.httpclient.HttpClientProvider; import org.keycloak.models.KeycloakSession; +import org.jboss.logging.Logger; + /** *

PublicKeyLoader to retrieve keys from a SAML metadata entity endpoint. * It can be used to load IDP or SP keys.

diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java index 63a198c29c1..a87a0cb54b5 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocol.java @@ -17,12 +17,29 @@ package org.keycloak.protocol.saml; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicReference; + +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPMessage; + import org.keycloak.broker.saml.SAMLDataMarshaller; import org.keycloak.common.VerificationException; import org.keycloak.common.util.KeycloakUriBuilder; @@ -89,31 +106,16 @@ import org.keycloak.services.messages.Messages; import org.keycloak.services.resources.RealmsResource; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.CommonClientSessionModel; -import org.w3c.dom.Document; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; -import jakarta.xml.soap.SOAPException; -import jakarta.xml.soap.SOAPMessage; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.UUID; -import java.util.concurrent.atomic.AtomicReference; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; +import org.jboss.logging.Logger; +import org.w3c.dom.Document; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java index 0d72d30db73..475ccb4aecf 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolFactory.java @@ -17,6 +17,12 @@ package org.keycloak.protocol.saml; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.xml.crypto.dsig.CanonicalizationMethod; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; @@ -27,11 +33,11 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.organization.protocol.mappers.saml.OrganizationMembershipMapper; import org.keycloak.protocol.AbstractLoginProtocolFactory; import org.keycloak.protocol.LoginProtocol; import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory; import org.keycloak.protocol.saml.mappers.AttributeStatementHelper; -import org.keycloak.organization.protocol.mappers.saml.OrganizationMembershipMapper; import org.keycloak.protocol.saml.mappers.RoleListMapper; import org.keycloak.protocol.saml.mappers.UserPropertyAttributeStatementMapper; import org.keycloak.representations.idm.CertificateRepresentation; @@ -41,12 +47,6 @@ import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.saml.v2.constants.X500SAMLProfileConstants; import org.keycloak.saml.validators.DestinationValidator; -import javax.xml.crypto.dsig.CanonicalizationMethod; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java index c847a168982..72c556c46ea 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlProtocolUtils.java @@ -17,8 +17,6 @@ package org.keycloak.protocol.saml; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.UriInfo; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.net.URI; @@ -27,8 +25,10 @@ import java.security.Key; import java.security.PublicKey; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -import org.apache.xml.security.encryption.XMLCipher; -import org.jboss.logging.Logger; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.VerificationException; import org.keycloak.common.util.PemUtils; import org.keycloak.crypto.KeyType; @@ -67,6 +67,9 @@ import org.keycloak.saml.processing.core.util.KeycloakKeySamlExtensionGenerator; import org.keycloak.saml.processing.core.util.RedirectBindingSignatureUtil; import org.keycloak.saml.processing.web.util.RedirectBindingUtil; import org.keycloak.utils.StringUtil; + +import org.apache.xml.security.encryption.XMLCipher; +import org.jboss.logging.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlService.java b/services/src/main/java/org/keycloak/protocol/saml/SamlService.java index 26012d26f9c..da82ca6b006 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlService.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlService.java @@ -17,12 +17,38 @@ package org.keycloak.protocol.saml; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.util.EntityUtils; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ExecutorService; +import java.util.stream.Collectors; +import javax.xml.crypto.dsig.XMLSignature; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.stream.XMLStreamWriter; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.container.Suspended; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.broker.saml.SAMLDataMarshaller; import org.keycloak.common.ClientConnection; import org.keycloak.common.VerificationException; @@ -108,42 +134,17 @@ import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.timer.ScheduledTask; import org.keycloak.transaction.AsyncResponseTransaction; import org.keycloak.utils.MediaType; + +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.util.EntityUtils; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.FormParam; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.container.AsyncResponse; -import jakarta.ws.rs.container.Suspended; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; -import javax.xml.crypto.dsig.XMLSignature; -import javax.xml.stream.XMLStreamWriter; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ExecutorService; -import java.util.stream.Collectors; - -import javax.xml.parsers.ParserConfigurationException; - import static org.keycloak.common.util.StackUtil.getShortStackTrace; /** @@ -1480,4 +1481,3 @@ public class SamlService extends AuthorizationEndpointBase { } } - diff --git a/services/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java b/services/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java index e98221ef5d9..5315c994036 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/protocol/saml/clientregistration/EntityDescriptorClientRegistrationProvider.java @@ -17,18 +17,19 @@ package org.keycloak.protocol.saml.clientregistration; -import org.keycloak.exportimport.ClientDescriptionConverter; -import org.keycloak.models.KeycloakSession; -import org.keycloak.protocol.saml.EntityDescriptorDescriptionConverter; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.services.clientregistration.AbstractClientRegistrationProvider; +import java.net.URI; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.POST; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.net.URI; + +import org.keycloak.exportimport.ClientDescriptionConverter; +import org.keycloak.models.KeycloakSession; +import org.keycloak.protocol.saml.EntityDescriptorDescriptionConverter; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.services.clientregistration.AbstractClientRegistrationProvider; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java index f27559f05f1..e9c2d024ce7 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlClientInstallation.java @@ -17,6 +17,12 @@ package org.keycloak.protocol.saml.installation; +import java.net.URI; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.Config; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -27,11 +33,6 @@ import org.keycloak.protocol.saml.SamlClient; import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.services.resources.RealmsResource; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import java.net.URI; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemCliInstallation.java b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemCliInstallation.java index 9e0b35a3f41..6520746f140 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemCliInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemCliInstallation.java @@ -17,7 +17,12 @@ package org.keycloak.protocol.saml.installation; -import static org.keycloak.protocol.util.ClientCliInstallationUtil.quote; +import java.net.URI; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.Config; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -26,13 +31,10 @@ import org.keycloak.models.RealmModel; import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.saml.SamlClient; import org.keycloak.protocol.saml.SamlProtocol; - -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.net.URI; -import jakarta.ws.rs.core.UriBuilder; import org.keycloak.services.resources.RealmsResource; +import static org.keycloak.protocol.util.ClientCliInstallationUtil.quote; + public class KeycloakSamlSubsystemCliInstallation implements ClientInstallationProvider { @Override diff --git a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemInstallation.java b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemInstallation.java index d45a128f5ba..63483d23b88 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/saml/installation/KeycloakSamlSubsystemInstallation.java @@ -17,6 +17,11 @@ package org.keycloak.protocol.saml.installation; +import java.net.URI; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -26,10 +31,6 @@ import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.saml.SamlClient; import org.keycloak.protocol.saml.SamlProtocol; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.net.URI; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/protocol/saml/installation/ModAuthMellonClientInstallation.java b/services/src/main/java/org/keycloak/protocol/saml/installation/ModAuthMellonClientInstallation.java index 95dca88789b..a6433743c45 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/installation/ModAuthMellonClientInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/saml/installation/ModAuthMellonClientInstallation.java @@ -17,10 +17,18 @@ package org.keycloak.protocol.saml.installation; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.regex.MatchResult; import java.util.regex.Pattern; import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; + +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.common.util.PemUtils; import org.keycloak.models.ClientModel; @@ -30,14 +38,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.saml.SamlClient; import org.keycloak.protocol.saml.SamlProtocol; - import org.keycloak.protocol.saml.SamlService; -import jakarta.ws.rs.core.Response; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.net.URI; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/protocol/saml/installation/SamlSPDescriptorClientInstallation.java b/services/src/main/java/org/keycloak/protocol/saml/installation/SamlSPDescriptorClientInstallation.java index dab8c438153..7e8bc7cfc5a 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/installation/SamlSPDescriptorClientInstallation.java +++ b/services/src/main/java/org/keycloak/protocol/saml/installation/SamlSPDescriptorClientInstallation.java @@ -17,7 +17,14 @@ package org.keycloak.protocol.saml.installation; -import org.jboss.logging.Logger; +import java.io.StringWriter; +import java.net.URI; +import java.util.Collections; +import javax.xml.stream.XMLStreamWriter; + +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.dom.saml.v2.metadata.EntityDescriptorType; import org.keycloak.dom.saml.v2.metadata.KeyDescriptorType; @@ -34,12 +41,7 @@ import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.processing.core.saml.v2.writers.SAMLMetadataWriter; -import java.io.StringWriter; -import java.net.URI; -import java.util.Collections; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import javax.xml.stream.XMLStreamWriter; +import org.jboss.logging.Logger; /** diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java index e78c8b8f625..379b54cd245 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/AttributeStatementHelper.java @@ -17,6 +17,12 @@ package org.keycloak.protocol.saml.mappers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.models.ProtocolMapperModel; @@ -25,12 +31,6 @@ import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/GroupMembershipMapper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/GroupMembershipMapper.java index 5d375ba2d8f..ae69292e9cb 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/GroupMembershipMapper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/GroupMembershipMapper.java @@ -17,6 +17,12 @@ package org.keycloak.protocol.saml.mappers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; + import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.models.AuthenticatedClientSessionModel; @@ -27,12 +33,6 @@ import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/HardcodedAttributeMapper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/HardcodedAttributeMapper.java index f557e2703da..e4af2d0b85a 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/HardcodedAttributeMapper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/HardcodedAttributeMapper.java @@ -17,6 +17,9 @@ package org.keycloak.protocol.saml.mappers; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.KeycloakSession; @@ -24,9 +27,6 @@ import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.List; - /** * Mappings UserModel property (the property name of a getter method) to an AttributeStatement. * diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/HardcodedRole.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/HardcodedRole.java index 9b78e60c94f..735f7826439 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/HardcodedRole.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/HardcodedRole.java @@ -17,15 +17,15 @@ package org.keycloak.protocol.saml.mappers; -import org.keycloak.models.ProtocolMapperModel; -import org.keycloak.protocol.saml.SamlProtocol; -import org.keycloak.provider.ProviderConfigProperty; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import org.keycloak.models.ProtocolMapperModel; +import org.keycloak.protocol.saml.SamlProtocol; +import org.keycloak.provider.ProviderConfigProperty; + /** * Mappings UserModel property (the property name of a getter method) to an AttributeStatement. * diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/NameIdMapperHelper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/NameIdMapperHelper.java index 7381a6d6a92..a7a94b1c5c4 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/NameIdMapperHelper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/NameIdMapperHelper.java @@ -1,11 +1,11 @@ package org.keycloak.protocol.saml.mappers; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.saml.common.constants.JBossSAMLURIConstants; - import java.util.ArrayList; import java.util.List; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.saml.common.constants.JBossSAMLURIConstants; + public class NameIdMapperHelper { public static final String NAMEID_MAPPER_CATEGORY = "NameID Mapper"; diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/RoleListMapper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/RoleListMapper.java index 7e1aca939fd..ab09ca2138d 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/RoleListMapper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/RoleListMapper.java @@ -17,6 +17,15 @@ package org.keycloak.protocol.saml.mappers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.models.ClientSessionContext; @@ -28,15 +37,6 @@ import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/RoleNameMapper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/RoleNameMapper.java index a15090dba06..d9fb1f3d495 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/RoleNameMapper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/RoleNameMapper.java @@ -17,6 +17,11 @@ package org.keycloak.protocol.saml.mappers; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -28,11 +33,6 @@ import org.keycloak.protocol.ProtocolMapper; import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * Map an assigned role to a different position and name in the token * diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/SAMLAudienceProtocolMapper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/SAMLAudienceProtocolMapper.java index 72064197809..177fbb9df25 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/SAMLAudienceProtocolMapper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/SAMLAudienceProtocolMapper.java @@ -20,7 +20,7 @@ package org.keycloak.protocol.saml.mappers; import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.jboss.logging.Logger; + import org.keycloak.dom.saml.v2.assertion.AudienceRestrictionType; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.models.ClientSessionContext; @@ -29,6 +29,8 @@ import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; import org.keycloak.provider.ProviderConfigProperty; +import org.jboss.logging.Logger; + /** * SAML mapper to add a audience restriction into the assertion, to another * client (clientId) or to a custom URI. Only one URI is added, clientId diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/SAMLAudienceResolveProtocolMapper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/SAMLAudienceResolveProtocolMapper.java index 87e5e4bf59e..3488ea8755e 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/SAMLAudienceResolveProtocolMapper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/SAMLAudienceResolveProtocolMapper.java @@ -19,7 +19,7 @@ package org.keycloak.protocol.saml.mappers; import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.jboss.logging.Logger; + import org.keycloak.dom.saml.v2.assertion.AudienceRestrictionType; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.models.ClientModel; @@ -31,6 +31,8 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.provider.ProviderConfigProperty; +import org.jboss.logging.Logger; + /** * SAML audience resolve mapper. The mapper adds all client_ids of \"allowed\" * clients to the audience conditions in the assertion. Allowed client means diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/ScriptBasedMapper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/ScriptBasedMapper.java index b6b30cabc11..8f460f5f77f 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/ScriptBasedMapper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/ScriptBasedMapper.java @@ -1,6 +1,10 @@ package org.keycloak.protocol.saml.mappers; -import org.jboss.logging.Logger; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; @@ -20,10 +24,7 @@ import org.keycloak.scripting.EvaluatableScriptAdapter; import org.keycloak.scripting.ScriptCompilationException; import org.keycloak.scripting.ScriptingProvider; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; /** diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeNameIdMapper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeNameIdMapper.java index db5e3c964ad..06abf86524d 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeNameIdMapper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeNameIdMapper.java @@ -1,5 +1,8 @@ package org.keycloak.protocol.saml.mappers; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; @@ -7,9 +10,6 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.List; - public class UserAttributeNameIdMapper extends AbstractSAMLProtocolMapper implements SAMLNameIdMapper { private static final List configProperties = new ArrayList(); diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeStatementMapper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeStatementMapper.java index fe011f37320..d8720402aae 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeStatementMapper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/UserAttributeStatementMapper.java @@ -17,6 +17,10 @@ package org.keycloak.protocol.saml.mappers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.KeycloakSession; @@ -27,10 +31,6 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collection; -import java.util.ArrayList; -import java.util.List; - /** * Mappings UserModel attribute (not property name of a getter method) to an AttributeStatement. * diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/UserPropertyAttributeStatementMapper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/UserPropertyAttributeStatementMapper.java index 3f248df6038..9c3af827663 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/UserPropertyAttributeStatementMapper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/UserPropertyAttributeStatementMapper.java @@ -17,6 +17,9 @@ package org.keycloak.protocol.saml.mappers; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.KeycloakSession; @@ -26,9 +29,6 @@ import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.ProtocolMapperUtils; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.List; - /** * Mappings UserModel property (the property name of a getter method) to an AttributeStatement. * diff --git a/services/src/main/java/org/keycloak/protocol/saml/mappers/UserSessionNoteStatementMapper.java b/services/src/main/java/org/keycloak/protocol/saml/mappers/UserSessionNoteStatementMapper.java index b4b24b5fecd..b805bfdb33c 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/mappers/UserSessionNoteStatementMapper.java +++ b/services/src/main/java/org/keycloak/protocol/saml/mappers/UserSessionNoteStatementMapper.java @@ -17,6 +17,9 @@ package org.keycloak.protocol.saml.mappers; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.KeycloakSession; @@ -24,9 +27,6 @@ import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.List; - /** * Maps a user session note to a SAML attribute * diff --git a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java index 4b25cef43bb..6d56735e12b 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java +++ b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/SamlEcpProfileService.java @@ -17,10 +17,18 @@ package org.keycloak.protocol.saml.profile.ecp; +import java.io.IOException; +import java.io.InputStream; +import java.util.Objects; + +import jakarta.ws.rs.core.Response; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPHeaderElement; + import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.events.EventBuilder; -import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.AuthenticatedClientSessionModel; +import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserSessionModel; @@ -39,14 +47,8 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.validators.DestinationValidator; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.sessions.AuthenticationSessionModel; -import org.w3c.dom.Document; -import jakarta.ws.rs.core.Response; -import jakarta.xml.soap.SOAPException; -import jakarta.xml.soap.SOAPHeaderElement; -import java.io.IOException; -import java.io.InputStream; -import java.util.Objects; +import org.w3c.dom.Document; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java index 3d36390849e..5893468d20c 100644 --- a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java +++ b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticator.java @@ -1,22 +1,23 @@ package org.keycloak.protocol.saml.profile.ecp.authenticator; -import org.keycloak.http.HttpRequest; +import java.util.Base64; +import java.util.List; + +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator; import org.keycloak.events.Details; import org.keycloak.events.Errors; +import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import java.util.Base64; -import java.util.List; - public class HttpBasicAuthenticator implements Authenticator { private static final String BASIC = "Basic"; diff --git a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticatorFactory.java b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticatorFactory.java index 62c3e0cdad9..3f2a79ac08e 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticatorFactory.java +++ b/services/src/main/java/org/keycloak/protocol/saml/profile/ecp/authenticator/HttpBasicAuthenticatorFactory.java @@ -17,6 +17,8 @@ package org.keycloak.protocol.saml.profile.ecp.authenticator; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -26,8 +28,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/protocol/saml/profile/util/Soap.java b/services/src/main/java/org/keycloak/protocol/saml/profile/util/Soap.java index f8866f51cd4..d92cc863d2f 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/profile/util/Soap.java +++ b/services/src/main/java/org/keycloak/protocol/saml/profile/util/Soap.java @@ -17,26 +17,20 @@ package org.keycloak.protocol.saml.profile.util; -import org.apache.http.Header; -import org.apache.http.HttpStatus; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ByteArrayEntity; -import org.apache.http.entity.ContentType; -import org.keycloak.http.simple.SimpleHttp; -import org.keycloak.http.simple.SimpleHttpRequest; -import org.keycloak.http.simple.SimpleHttpResponse; -import org.keycloak.models.KeycloakSession; -import org.keycloak.saml.processing.core.saml.v2.util.DocumentUtil; -import org.keycloak.saml.processing.web.util.PostBindingUtil; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.util.Iterator; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.MimeHeader; +import jakarta.xml.soap.MimeHeaders; import jakarta.xml.soap.Name; import jakarta.xml.soap.SOAPBody; import jakarta.xml.soap.SOAPConnection; @@ -44,16 +38,24 @@ import jakarta.xml.soap.SOAPConnectionFactory; import jakarta.xml.soap.SOAPEnvelope; import jakarta.xml.soap.SOAPException; import jakarta.xml.soap.SOAPFault; -import jakarta.xml.soap.MimeHeader; -import jakarta.xml.soap.MimeHeaders; import jakarta.xml.soap.SOAPHeaderElement; import jakarta.xml.soap.SOAPMessage; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.util.Iterator; + +import org.keycloak.http.simple.SimpleHttp; +import org.keycloak.http.simple.SimpleHttpRequest; +import org.keycloak.http.simple.SimpleHttpResponse; +import org.keycloak.models.KeycloakSession; +import org.keycloak.saml.processing.core.saml.v2.util.DocumentUtil; +import org.keycloak.saml.processing.web.util.PostBindingUtil; + +import org.apache.http.Header; +import org.apache.http.HttpStatus; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.entity.ContentType; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * @author Pedro Igor diff --git a/services/src/main/java/org/keycloak/provider/DefaultProviderLoader.java b/services/src/main/java/org/keycloak/provider/DefaultProviderLoader.java index ced747ac78e..7460a7da260 100644 --- a/services/src/main/java/org/keycloak/provider/DefaultProviderLoader.java +++ b/services/src/main/java/org/keycloak/provider/DefaultProviderLoader.java @@ -17,16 +17,16 @@ package org.keycloak.provider; -import org.keycloak.theme.ClasspathThemeProviderFactory; -import org.keycloak.theme.ClasspathThemeResourceProviderFactory; -import org.keycloak.theme.ThemeResourceSpi; -import org.keycloak.theme.ThemeSpi; - import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.ServiceLoader; +import org.keycloak.theme.ClasspathThemeProviderFactory; +import org.keycloak.theme.ClasspathThemeResourceProviderFactory; +import org.keycloak.theme.ThemeResourceSpi; +import org.keycloak.theme.ThemeSpi; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/provider/FileSystemProviderLoaderFactory.java b/services/src/main/java/org/keycloak/provider/FileSystemProviderLoaderFactory.java index f95304cff6e..2df971c592f 100644 --- a/services/src/main/java/org/keycloak/provider/FileSystemProviderLoaderFactory.java +++ b/services/src/main/java/org/keycloak/provider/FileSystemProviderLoaderFactory.java @@ -16,8 +16,6 @@ */ package org.keycloak.provider; -import org.jboss.logging.Logger; - import java.io.File; import java.io.FilenameFilter; import java.net.URL; @@ -25,6 +23,8 @@ import java.net.URLClassLoader; import java.util.LinkedList; import java.util.List; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/provider/ProviderManager.java b/services/src/main/java/org/keycloak/provider/ProviderManager.java index 60a9c721f4a..968ed47a99e 100644 --- a/services/src/main/java/org/keycloak/provider/ProviderManager.java +++ b/services/src/main/java/org/keycloak/provider/ProviderManager.java @@ -16,10 +16,6 @@ */ package org.keycloak.provider; -import org.jboss.logging.Logger; -import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.services.DefaultKeycloakSessionFactory; - import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -28,6 +24,11 @@ import java.util.List; import java.util.Map; import java.util.ServiceLoader; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.services.DefaultKeycloakSessionFactory; + +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/scripting/DefaultScriptingProvider.java b/services/src/main/java/org/keycloak/scripting/DefaultScriptingProvider.java index 48fdb4b2814..cbff4f5939e 100644 --- a/services/src/main/java/org/keycloak/scripting/DefaultScriptingProvider.java +++ b/services/src/main/java/org/keycloak/scripting/DefaultScriptingProvider.java @@ -23,10 +23,11 @@ import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import javax.script.ScriptException; -import org.jboss.logging.Logger; import org.keycloak.models.ScriptModel; import org.keycloak.services.ServicesLogger; +import org.jboss.logging.Logger; + /** * A {@link ScriptingProvider} that uses a {@link ScriptEngineManager} to evaluate scripts with a {@link ScriptEngine}. * diff --git a/services/src/main/java/org/keycloak/scripting/DefaultScriptingProviderFactory.java b/services/src/main/java/org/keycloak/scripting/DefaultScriptingProviderFactory.java index 8497b180ebd..b49fce53bca 100644 --- a/services/src/main/java/org/keycloak/scripting/DefaultScriptingProviderFactory.java +++ b/services/src/main/java/org/keycloak/scripting/DefaultScriptingProviderFactory.java @@ -18,13 +18,13 @@ package org.keycloak.scripting; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import javax.script.ScriptEngine; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import javax.script.ScriptEngine; +import org.jboss.logging.Logger; /** * @author Thomas Darimont diff --git a/services/src/main/java/org/keycloak/services/CorsErrorResponseException.java b/services/src/main/java/org/keycloak/services/CorsErrorResponseException.java index 1c8731b1486..7e8f5f55359 100644 --- a/services/src/main/java/org/keycloak/services/CorsErrorResponseException.java +++ b/services/src/main/java/org/keycloak/services/CorsErrorResponseException.java @@ -17,13 +17,13 @@ package org.keycloak.services; -import org.keycloak.representations.idm.OAuth2ErrorRepresentation; -import org.keycloak.services.cors.Cors; - import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; +import org.keycloak.representations.idm.OAuth2ErrorRepresentation; +import org.keycloak.services.cors.Cors; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/DefaultComponentFactoryProviderFactory.java b/services/src/main/java/org/keycloak/services/DefaultComponentFactoryProviderFactory.java index 6d358c228f2..40e1f594aef 100644 --- a/services/src/main/java/org/keycloak/services/DefaultComponentFactoryProviderFactory.java +++ b/services/src/main/java/org/keycloak/services/DefaultComponentFactoryProviderFactory.java @@ -16,6 +16,16 @@ */ package org.keycloak.services; +import java.util.Arrays; +import java.util.Collection; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; +import java.util.stream.Stream; + import org.keycloak.Config; import org.keycloak.Config.Scope; import org.keycloak.cluster.ClusterProvider; @@ -31,15 +41,7 @@ import org.keycloak.provider.InvalidationHandler.InvalidableObjectType; import org.keycloak.provider.InvalidationHandler.ObjectType; import org.keycloak.provider.Provider; import org.keycloak.provider.ProviderFactory; -import java.util.Arrays; -import java.util.Collection; -import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Function; -import java.util.stream.Stream; + import org.jboss.logging.Logger; /** diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java index 7a60eb49947..6e0243d1e28 100755 --- a/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java +++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakContext.java @@ -17,8 +17,14 @@ package org.keycloak.services; -import io.opentelemetry.api.trace.Span; +import java.net.URI; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; + import jakarta.ws.rs.core.HttpHeaders; + import org.keycloak.Token; import org.keycloak.common.ClientConnection; import org.keycloak.http.HttpRequest; @@ -40,11 +46,7 @@ import org.keycloak.tracing.TracingAttributes; import org.keycloak.tracing.TracingProvider; import org.keycloak.urls.UrlType; -import java.net.URI; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Optional; +import io.opentelemetry.api.trace.Span; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java index b76f8f9268e..266331e920d 100644 --- a/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java +++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakSession.java @@ -16,7 +16,21 @@ */ package org.keycloak.services; -import org.jboss.logging.Logger; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import org.keycloak.common.util.StackUtil; import org.keycloak.component.ComponentFactory; import org.keycloak.component.ComponentModel; @@ -41,10 +55,10 @@ import org.keycloak.models.UserLoginFailureProvider; import org.keycloak.models.UserProvider; import org.keycloak.models.UserSessionProvider; import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.provider.Provider; -import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.InvalidationHandler.InvalidableObjectType; import org.keycloak.provider.InvalidationHandler.ObjectType; +import org.keycloak.provider.Provider; +import org.keycloak.provider.ProviderFactory; import org.keycloak.services.clientpolicy.ClientPolicyManager; import org.keycloak.sessions.AuthenticationSessionProvider; import org.keycloak.storage.DatastoreProvider; @@ -52,20 +66,7 @@ import org.keycloak.vault.DefaultVaultTranscriber; import org.keycloak.vault.VaultProvider; import org.keycloak.vault.VaultTranscriber; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Optional; -import java.util.Set; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collectors; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java index 30cb49cf515..6a86b9ba158 100755 --- a/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java +++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakSessionFactory.java @@ -34,7 +34,6 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentFactoryProvider; @@ -57,6 +56,8 @@ import org.keycloak.provider.Spi; import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.theme.ThemeManagerFactory; +import org.jboss.logging.Logger; + public abstract class DefaultKeycloakSessionFactory implements KeycloakSessionFactory, ProviderManagerDeployer { private static final Logger logger = Logger.getLogger(DefaultKeycloakSessionFactory.class); diff --git a/services/src/main/java/org/keycloak/services/DefaultKeycloakTransactionManager.java b/services/src/main/java/org/keycloak/services/DefaultKeycloakTransactionManager.java index d27cb87ce61..b7107e6287a 100755 --- a/services/src/main/java/org/keycloak/services/DefaultKeycloakTransactionManager.java +++ b/services/src/main/java/org/keycloak/services/DefaultKeycloakTransactionManager.java @@ -16,6 +16,11 @@ */ package org.keycloak.services; +import java.util.LinkedList; +import java.util.List; + +import jakarta.transaction.TransactionManager; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakTransaction; import org.keycloak.models.KeycloakTransactionManager; @@ -23,10 +28,6 @@ import org.keycloak.tracing.TracingProvider; import org.keycloak.transaction.JtaTransactionManagerLookup; import org.keycloak.transaction.JtaTransactionWrapper; -import jakarta.transaction.TransactionManager; -import java.util.LinkedList; -import java.util.List; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/ErrorPage.java b/services/src/main/java/org/keycloak/services/ErrorPage.java index 21932326b5f..561c09bf6a5 100755 --- a/services/src/main/java/org/keycloak/services/ErrorPage.java +++ b/services/src/main/java/org/keycloak/services/ErrorPage.java @@ -16,12 +16,12 @@ */ package org.keycloak.services; +import jakarta.ws.rs.core.Response; + import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.sessions.AuthenticationSessionModel; -import jakarta.ws.rs.core.Response; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/ErrorPageException.java b/services/src/main/java/org/keycloak/services/ErrorPageException.java index 3bccd07c928..14b7a4d50de 100644 --- a/services/src/main/java/org/keycloak/services/ErrorPageException.java +++ b/services/src/main/java/org/keycloak/services/ErrorPageException.java @@ -17,12 +17,12 @@ package org.keycloak.services; -import org.keycloak.models.KeycloakSession; -import org.keycloak.sessions.AuthenticationSessionModel; - import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; +import org.keycloak.models.KeycloakSession; +import org.keycloak.sessions.AuthenticationSessionModel; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/ErrorResponse.java b/services/src/main/java/org/keycloak/services/ErrorResponse.java index c157f60a786..ceb8357284f 100755 --- a/services/src/main/java/org/keycloak/services/ErrorResponse.java +++ b/services/src/main/java/org/keycloak/services/ErrorResponse.java @@ -17,11 +17,12 @@ package org.keycloak.services; -import org.keycloak.representations.idm.ErrorRepresentation; +import java.util.List; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.representations.idm.ErrorRepresentation; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/ErrorResponseException.java b/services/src/main/java/org/keycloak/services/ErrorResponseException.java index 99fe06fdc70..8ab5f51082a 100644 --- a/services/src/main/java/org/keycloak/services/ErrorResponseException.java +++ b/services/src/main/java/org/keycloak/services/ErrorResponseException.java @@ -17,14 +17,14 @@ package org.keycloak.services; -import org.keycloak.models.KeycloakSession; -import org.keycloak.representations.idm.OAuth2ErrorRepresentation; -import org.keycloak.utils.KeycloakSessionUtil; - import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; +import org.keycloak.models.KeycloakSession; +import org.keycloak.representations.idm.OAuth2ErrorRepresentation; +import org.keycloak.utils.KeycloakSessionUtil; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/FormPartValueImpl.java b/services/src/main/java/org/keycloak/services/FormPartValueImpl.java index 3e2f944764f..b9038da7b4f 100644 --- a/services/src/main/java/org/keycloak/services/FormPartValueImpl.java +++ b/services/src/main/java/org/keycloak/services/FormPartValueImpl.java @@ -19,6 +19,7 @@ package org.keycloak.services; import java.io.ByteArrayInputStream; import java.io.InputStream; + import org.keycloak.http.FormPartValue; public class FormPartValueImpl implements FormPartValue { diff --git a/services/src/main/java/org/keycloak/services/ServicesLogger.java b/services/src/main/java/org/keycloak/services/ServicesLogger.java index e6a47b6f3a6..4e39210dc97 100644 --- a/services/src/main/java/org/keycloak/services/ServicesLogger.java +++ b/services/src/main/java/org/keycloak/services/ServicesLogger.java @@ -17,6 +17,15 @@ package org.keycloak.services; +import java.io.IOException; +import java.lang.invoke.MethodHandles; +import java.net.URI; +import javax.naming.NamingException; + +import org.keycloak.email.EmailException; +import org.keycloak.events.EventListenerProvider; +import org.keycloak.models.ModelDuplicateException; + import org.jboss.logging.BasicLogger; import org.jboss.logging.Logger; import org.jboss.logging.annotations.Cause; @@ -24,14 +33,6 @@ import org.jboss.logging.annotations.LogMessage; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; import org.jboss.logging.annotations.Once; -import org.keycloak.email.EmailException; -import org.keycloak.events.EventListenerProvider; -import org.keycloak.models.ModelDuplicateException; - -import javax.naming.NamingException; -import java.io.IOException; -import java.lang.invoke.MethodHandles; -import java.net.URI; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.ERROR; diff --git a/services/src/main/java/org/keycloak/services/Urls.java b/services/src/main/java/org/keycloak/services/Urls.java index b4ada717beb..c27fca2dce4 100755 --- a/services/src/main/java/org/keycloak/services/Urls.java +++ b/services/src/main/java/org/keycloak/services/Urls.java @@ -16,9 +16,13 @@ */ package org.keycloak.services; +import java.net.URI; + +import jakarta.ws.rs.core.UriBuilder; + +import org.keycloak.broker.saml.SAMLEndpoint; import org.keycloak.common.Version; import org.keycloak.models.Constants; -import org.keycloak.broker.saml.SAMLEndpoint; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.protocol.oidc.endpoints.LogoutEndpoint; @@ -30,10 +34,7 @@ import org.keycloak.services.resources.LoginActionsService; import org.keycloak.services.resources.RealmsResource; import org.keycloak.services.resources.ThemeResource; import org.keycloak.services.resources.admin.AdminRoot; - import org.keycloak.utils.StringUtil; -import jakarta.ws.rs.core.UriBuilder; -import java.net.URI; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/ClientPoliciesUtil.java b/services/src/main/java/org/keycloak/services/clientpolicy/ClientPoliciesUtil.java index 3326948e0f7..451933e2317 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/ClientPoliciesUtil.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/ClientPoliciesUtil.java @@ -19,7 +19,6 @@ package org.keycloak.services.clientpolicy; -import com.fasterxml.jackson.databind.JsonNode; import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -29,7 +28,7 @@ import java.util.List; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import org.jboss.logging.Logger; + import org.keycloak.common.Profile; import org.keycloak.component.ComponentModel; import org.keycloak.component.JsonConfigComponentModel; @@ -53,6 +52,9 @@ import org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProvider; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.FileUtils; +import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; + /** * Utilities for treating client policies/profiles * diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/DefaultClientPolicyManager.java b/services/src/main/java/org/keycloak/services/clientpolicy/DefaultClientPolicyManager.java index 0c410043ae4..16f0684c53b 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/DefaultClientPolicyManager.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/DefaultClientPolicyManager.java @@ -20,7 +20,6 @@ package org.keycloak.services.clientpolicy; import java.io.IOException; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -31,6 +30,8 @@ import org.keycloak.services.clientpolicy.condition.ClientPolicyConditionProvide import org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProvider; import org.keycloak.util.JsonSerialization; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/DefaultClientPolicyManagerFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/DefaultClientPolicyManagerFactory.java index baec7203579..f7b138d0051 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/DefaultClientPolicyManagerFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/DefaultClientPolicyManagerFactory.java @@ -18,11 +18,12 @@ package org.keycloak.services.clientpolicy; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/AcrCondition.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/AcrCondition.java index d29f2c4c986..a0238f9ad8d 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/AcrCondition.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/AcrCondition.java @@ -17,7 +17,8 @@ package org.keycloak.services.clientpolicy.condition; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; + import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.utils.AcrUtils; @@ -28,7 +29,7 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.ClientPolicyVote; import org.keycloak.services.clientpolicy.context.AuthorizationRequestContext; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/AcrConditionFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/AcrConditionFactory.java index 53a9cf3ab61..0150d340196 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/AcrConditionFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/AcrConditionFactory.java @@ -17,12 +17,12 @@ package org.keycloak.services.clientpolicy.condition; -import org.keycloak.models.KeycloakSession; -import org.keycloak.provider.ProviderConfigProperty; - import java.util.ArrayList; import java.util.List; +import org.keycloak.models.KeycloakSession; +import org.keycloak.provider.ProviderConfigProperty; + /** * @author Giuseppe Graziano */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAccessTypeCondition.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAccessTypeCondition.java index 95d10a102c1..830864cf126 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAccessTypeCondition.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAccessTypeCondition.java @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import org.jboss.logging.Logger; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.idm.ClientPolicyConditionConfigurationRepresentation; @@ -31,6 +30,8 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.ClientPolicyVote; import org.keycloak.services.clientpolicy.context.ClientCRUDContext; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAttributesCondition.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAttributesCondition.java index 143c6aefa23..ffae65fd0c6 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAttributesCondition.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAttributesCondition.java @@ -17,7 +17,9 @@ package org.keycloak.services.clientpolicy.condition; -import org.jboss.logging.Logger; +import java.util.List; +import java.util.Map; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.utils.MapperTypeSerializer; @@ -27,8 +29,7 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.ClientPolicyVote; import org.keycloak.services.clientpolicy.context.PreAuthorizationRequestContext; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; /** * @author Yoshiyuki Tabata diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAttributesConditionFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAttributesConditionFactory.java index 3e98999bfde..2e20d4ac64a 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAttributesConditionFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientAttributesConditionFactory.java @@ -17,12 +17,12 @@ package org.keycloak.services.clientpolicy.condition; -import org.keycloak.models.KeycloakSession; -import org.keycloak.provider.ProviderConfigProperty; - import java.util.ArrayList; import java.util.List; +import org.keycloak.models.KeycloakSession; +import org.keycloak.provider.ProviderConfigProperty; + /** * @author Yoshiyuki Tabata */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientProtocolConditionFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientProtocolConditionFactory.java index b765bf4014b..a5c3cb9ed47 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientProtocolConditionFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientProtocolConditionFactory.java @@ -19,6 +19,7 @@ package org.keycloak.services.clientpolicy.condition; import java.util.LinkedList; import java.util.List; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientRolesCondition.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientRolesCondition.java index c7fc19962f7..3e2ebc2f168 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientRolesCondition.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientRolesCondition.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RoleModel; @@ -32,6 +31,8 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.ClientPolicyVote; import org.keycloak.services.clientpolicy.context.PreAuthorizationRequestContext; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientScopesCondition.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientScopesCondition.java index 30fb2c6307c..0c9a7681caa 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientScopesCondition.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientScopesCondition.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; @@ -45,6 +44,8 @@ import org.keycloak.services.clientpolicy.context.TokenExchangeRequestContext; import org.keycloak.services.clientpolicy.context.TokenRequestContext; import org.keycloak.services.clientpolicy.context.TokenResponseContext; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterContextCondition.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterContextCondition.java index 2e6bc841f02..286f654f216 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterContextCondition.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterContextCondition.java @@ -20,7 +20,6 @@ package org.keycloak.services.clientpolicy.condition; import java.util.Collections; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.JsonWebToken; import org.keycloak.representations.idm.ClientPolicyConditionConfigurationRepresentation; @@ -32,6 +31,7 @@ import org.keycloak.services.clientregistration.ClientRegistrationTokenUtils; import org.keycloak.util.TokenUtil; import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceGroupsCondition.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceGroupsCondition.java index e7eae617856..ea9c91e1522 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceGroupsCondition.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceGroupsCondition.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; @@ -42,6 +41,8 @@ import org.keycloak.services.clientpolicy.context.DynamicClientRegisteredContext import org.keycloak.services.clientpolicy.context.DynamicClientUpdateContext; import org.keycloak.services.clientpolicy.context.DynamicClientUpdatedContext; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceHostsCondition.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceHostsCondition.java index 4a379084898..3ce1718f446 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceHostsCondition.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceHostsCondition.java @@ -23,7 +23,6 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.idm.ClientPolicyConditionConfigurationRepresentation; import org.keycloak.services.clientpolicy.ClientPolicyContext; @@ -31,6 +30,7 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.ClientPolicyVote; import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceRolesCondition.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceRolesCondition.java index 0e6a677c47f..7198f29a6a8 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceRolesCondition.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/ClientUpdaterSourceRolesCondition.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -44,6 +43,8 @@ import org.keycloak.services.clientpolicy.context.DynamicClientRegisteredContext import org.keycloak.services.clientpolicy.context.DynamicClientUpdateContext; import org.keycloak.services.clientpolicy.context.DynamicClientUpdatedContext; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/GrantTypeCondition.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/GrantTypeCondition.java index f3cc49cfe40..02f6de4234a 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/GrantTypeCondition.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/GrantTypeCondition.java @@ -17,8 +17,8 @@ package org.keycloak.services.clientpolicy.condition; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.OAuth2Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.utils.OIDCResponseType; @@ -28,7 +28,8 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.ClientPolicyVote; import org.keycloak.services.clientpolicy.context.AuthorizationRequestContext; -import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; /** * @author Giuseppe Graziano/a> diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/condition/GrantTypeConditionFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/condition/GrantTypeConditionFactory.java index 630abe393b5..66879e8c0a3 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/condition/GrantTypeConditionFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/condition/GrantTypeConditionFactory.java @@ -17,16 +17,16 @@ package org.keycloak.services.clientpolicy.condition; -import org.keycloak.OAuth2Constants; -import org.keycloak.common.Profile; -import org.keycloak.models.KeycloakSession; -import org.keycloak.provider.ProviderConfigProperty; - import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.keycloak.OAuth2Constants; +import org.keycloak.common.Profile; +import org.keycloak.models.KeycloakSession; +import org.keycloak.provider.ProviderConfigProperty; + /** * @author Giuseppe Graziano */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsResponseContext.java b/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsResponseContext.java index 2646ad4c0a7..f160356f0b8 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsResponseContext.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/context/ResourceOwnerPasswordCredentialsResponseContext.java @@ -59,4 +59,3 @@ public class ResourceOwnerPasswordCredentialsResponseContext implements ClientPo } } - diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/AuthenticationFlowSelectorExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/AuthenticationFlowSelectorExecutor.java index 6c35b4ac6b4..c036356f1c2 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/AuthenticationFlowSelectorExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/AuthenticationFlowSelectorExecutor.java @@ -17,7 +17,6 @@ package org.keycloak.services.clientpolicy.executor; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.models.Constants; import org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation; import org.keycloak.services.clientpolicy.ClientPolicyContext; @@ -26,6 +25,8 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.AuthorizationRequestContext; import org.keycloak.sessions.AuthenticationSessionModel; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Giuseppe Graziano */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/AuthenticationFlowSelectorExecutorFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/AuthenticationFlowSelectorExecutorFactory.java index 52406066fd3..c353f21e3b9 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/AuthenticationFlowSelectorExecutorFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/AuthenticationFlowSelectorExecutorFactory.java @@ -17,14 +17,14 @@ package org.keycloak.services.clientpolicy.executor; +import java.util.Arrays; +import java.util.List; + import org.keycloak.Config.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Arrays; -import java.util.List; - /** * @author Giuseppe Graziano */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/ClientSecretRotationExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/ClientSecretRotationExecutor.java index bfde92be0de..af382fabb85 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/ClientSecretRotationExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/ClientSecretRotationExecutor.java @@ -3,8 +3,6 @@ package org.keycloak.services.clientpolicy.executor; import java.text.SimpleDateFormat; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSecretConstants; @@ -18,6 +16,9 @@ import org.keycloak.services.clientpolicy.context.ClientCRUDContext; import org.keycloak.services.clientpolicy.context.ClientSecretRotationContext; import org.keycloak.services.clientpolicy.context.DynamicClientUpdatedContext; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; + import static org.keycloak.services.clientpolicy.executor.ClientSecretRotationExecutorFactory.DEFAULT_SECRET_EXPIRATION_PERIOD; import static org.keycloak.services.clientpolicy.executor.ClientSecretRotationExecutorFactory.DEFAULT_SECRET_REMAINING_ROTATION_PERIOD; import static org.keycloak.services.clientpolicy.executor.ClientSecretRotationExecutorFactory.DEFAULT_SECRET_ROTATED_EXPIRATION_PERIOD; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/ConsentRequiredExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/ConsentRequiredExecutor.java index 8ced7060b08..bfd742261e2 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/ConsentRequiredExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/ConsentRequiredExecutor.java @@ -17,7 +17,6 @@ package org.keycloak.services.clientpolicy.executor; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.events.Errors; import org.keycloak.models.ClientModel; import org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation; @@ -26,6 +25,8 @@ import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.ClientCRUDContext; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/DPoPBindEnforcerExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/DPoPBindEnforcerExecutor.java index 20515f1cd7e..fd1f67112f0 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/DPoPBindEnforcerExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/DPoPBindEnforcerExecutor.java @@ -17,12 +17,13 @@ package org.keycloak.services.clientpolicy.executor; -import org.jboss.logging.Logger; +import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.common.Profile; -import org.keycloak.common.VerificationException; import org.keycloak.common.Profile.Feature; +import org.keycloak.common.VerificationException; import org.keycloak.http.HttpRequest; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -41,8 +42,7 @@ import org.keycloak.services.clientpolicy.context.TokenRevokeContext; import org.keycloak.services.util.DPoPUtil; import com.fasterxml.jackson.annotation.JsonProperty; - -import jakarta.ws.rs.core.MultivaluedMap; +import org.jboss.logging.Logger; public class DPoPBindEnforcerExecutor implements ClientPolicyExecutorProvider { diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/DownscopeAssertionGrantEnforcerExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/DownscopeAssertionGrantEnforcerExecutor.java index e040a95d8eb..34982c9f1b3 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/DownscopeAssertionGrantEnforcerExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/DownscopeAssertionGrantEnforcerExecutor.java @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.jose.jws.JWSInput; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/DownscopeAssertionGrantEnforcerExecutorFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/DownscopeAssertionGrantEnforcerExecutorFactory.java index 8c7c87a10b3..e1b59571959 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/DownscopeAssertionGrantEnforcerExecutorFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/DownscopeAssertionGrantEnforcerExecutorFactory.java @@ -18,6 +18,7 @@ package org.keycloak.services.clientpolicy.executor; import java.util.Collections; import java.util.List; + import org.keycloak.Config.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/FullScopeDisabledExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/FullScopeDisabledExecutor.java index 70dcb9276ad..8b21cba4fa4 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/FullScopeDisabledExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/FullScopeDisabledExecutor.java @@ -18,7 +18,6 @@ package org.keycloak.services.clientpolicy.executor; -import com.fasterxml.jackson.annotation.JsonProperty; import org.keycloak.events.Errors; import org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation; import org.keycloak.representations.idm.ClientRepresentation; @@ -26,6 +25,8 @@ import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.ClientCRUDContext; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Check that switch "fullScopeAllowed" is not enabled for the clients * diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutor.java index 53d2806224e..ca36bcc949f 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutor.java @@ -17,11 +17,13 @@ package org.keycloak.services.clientpolicy.executor; -import org.keycloak.http.HttpRequest; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.events.Errors; +import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; import org.keycloak.representations.AccessToken; @@ -39,9 +41,6 @@ import org.keycloak.services.util.MtlsHoKTokenUtil; import com.fasterxml.jackson.annotation.JsonProperty; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; - public class HolderOfKeyEnforcerExecutor implements ClientPolicyExecutorProvider { private final KeycloakSession session; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutorFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutorFactory.java index 248114ceda5..9abdb5a75fc 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutorFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/HolderOfKeyEnforcerExecutorFactory.java @@ -17,14 +17,14 @@ package org.keycloak.services.clientpolicy.executor; +import java.util.Collections; +import java.util.List; + import org.keycloak.Config.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.List; - public class HolderOfKeyEnforcerExecutorFactory implements ClientPolicyExecutorProviderFactory { public static final String PROVIDER_ID = "holder-of-key-enforcer"; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/IntentClientBindCheckExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/IntentClientBindCheckExecutor.java index cddfcd6c5d4..27d3470217d 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/IntentClientBindCheckExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/IntentClientBindCheckExecutor.java @@ -24,7 +24,6 @@ import java.util.Optional; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.http.simple.SimpleHttp; import org.keycloak.http.simple.SimpleHttpRequest; @@ -39,6 +38,7 @@ import org.keycloak.services.clientpolicy.context.AuthorizationRequestContext; import org.keycloak.util.JsonSerialization; import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/RegistrationAccessTokenRotationDisabledExecutorFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/RegistrationAccessTokenRotationDisabledExecutorFactory.java index f675e010421..289b79424d9 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/RegistrationAccessTokenRotationDisabledExecutorFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/RegistrationAccessTokenRotationDisabledExecutorFactory.java @@ -19,6 +19,7 @@ package org.keycloak.services.clientpolicy.executor; import java.util.Collections; import java.util.List; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/RejectImplicitGrantExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/RejectImplicitGrantExecutor.java index 579cda09a11..b517f60b7d3 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/RejectImplicitGrantExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/RejectImplicitGrantExecutor.java @@ -18,6 +18,7 @@ package org.keycloak.services.clientpolicy.executor; import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.OAuthErrorException; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.endpoints.request.AuthorizationEndpointRequest; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlAvoidRedirectBindingExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlAvoidRedirectBindingExecutor.java index e9d1a5ae14f..d6f9185bec2 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlAvoidRedirectBindingExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlAvoidRedirectBindingExecutor.java @@ -18,6 +18,7 @@ package org.keycloak.services.clientpolicy.executor; import java.net.URI; + import org.keycloak.OAuthErrorException; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlAvoidRedirectBindingExecutorFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlAvoidRedirectBindingExecutorFactory.java index ff2916e251f..1180f4953c1 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlAvoidRedirectBindingExecutorFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlAvoidRedirectBindingExecutorFactory.java @@ -18,6 +18,7 @@ package org.keycloak.services.clientpolicy.executor; import java.util.List; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSecureClientUrisExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSecureClientUrisExecutor.java index fba8ef76688..0246c3e3172 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSecureClientUrisExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSecureClientUrisExecutor.java @@ -17,10 +17,10 @@ package org.keycloak.services.clientpolicy.executor; -import com.fasterxml.jackson.annotation.JsonProperty; import java.net.URI; import java.util.Collection; import java.util.Map; + import org.keycloak.OAuthErrorException; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.models.ClientModel; @@ -36,6 +36,8 @@ import org.keycloak.services.clientpolicy.context.SamlAuthnRequestContext; import org.keycloak.services.clientpolicy.context.SamlLogoutRequestContext; import org.keycloak.utils.StringUtil; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * * @author rmartinc diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSecureClientUrisExecutorFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSecureClientUrisExecutorFactory.java index b37965cac96..d9621f3acd2 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSecureClientUrisExecutorFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSecureClientUrisExecutorFactory.java @@ -18,6 +18,7 @@ package org.keycloak.services.clientpolicy.executor; import java.util.List; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSignatureEnforcerExecutorFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSignatureEnforcerExecutorFactory.java index d26bea755c6..e56f1c94a1a 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSignatureEnforcerExecutorFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SamlSignatureEnforcerExecutorFactory.java @@ -18,6 +18,7 @@ package org.keycloak.services.clientpolicy.executor; import java.util.List; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticationAssertionExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticationAssertionExecutor.java index 2f4125dadb5..b33848c2db8 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticationAssertionExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticationAssertionExecutor.java @@ -17,8 +17,13 @@ package org.keycloak.services.clientpolicy.executor; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + import jakarta.ws.rs.core.MultivaluedMap; -import org.jboss.logging.Logger; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.common.util.Base64Url; @@ -32,10 +37,7 @@ import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticationAssertionExecutorFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticationAssertionExecutorFactory.java index 8916f82cd92..588c281a1ef 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticationAssertionExecutorFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticationAssertionExecutorFactory.java @@ -17,14 +17,14 @@ package org.keycloak.services.clientpolicy.executor; +import java.util.Collections; +import java.util.List; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.List; - /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticatorExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticatorExecutor.java index 8433e208e36..72a48c17376 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticatorExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientAuthenticatorExecutor.java @@ -19,7 +19,6 @@ package org.keycloak.services.clientpolicy.executor; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -30,6 +29,7 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.ClientCRUDContext; import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientUrisExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientUrisExecutor.java index f0214f95d0e..d320a70b950 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientUrisExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureClientUrisExecutor.java @@ -22,14 +22,13 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.models.CibaConfig; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.OIDCConfigAttributes; -import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation; +import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.AdminClientRegisterContext; @@ -39,6 +38,8 @@ import org.keycloak.services.clientpolicy.context.ClientCRUDContext; import org.keycloak.services.clientpolicy.context.DynamicClientRegisterContext; import org.keycloak.services.clientpolicy.context.DynamicClientUpdateContext; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutor.java index 0089639875f..8280d44133b 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutor.java @@ -18,9 +18,11 @@ package org.keycloak.services.clientpolicy.executor; import java.util.Optional; + import jakarta.ws.rs.HttpMethod; -import org.keycloak.http.HttpRequest; + import org.keycloak.events.Errors; +import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; import org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation; @@ -29,6 +31,7 @@ import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.ClientCRUDContext; import org.keycloak.utils.StringUtil; + import com.fasterxml.jackson.annotation.JsonProperty; public class SecureLogoutExecutor implements ClientPolicyExecutorProvider { diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutorFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutorFactory.java index 4859638a6bc..b6b342d4f41 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutorFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureLogoutExecutorFactory.java @@ -19,6 +19,7 @@ package org.keycloak.services.clientpolicy.executor; import java.util.Collections; import java.util.List; + import org.keycloak.Config.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureParContentsExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureParContentsExecutor.java index 6e1115d2175..e3c3328fd8c 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureParContentsExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureParContentsExecutor.java @@ -21,7 +21,8 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.jboss.logging.Logger; +import jakarta.ws.rs.core.MultivaluedMap; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.models.ClientModel; @@ -41,7 +42,7 @@ import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.PreAuthorizationRequestContext; -import jakarta.ws.rs.core.MultivaluedMap; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRedirectUrisEnforcerExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRedirectUrisEnforcerExecutor.java index 7d6f4bbee55..7bc1fd88292 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRedirectUrisEnforcerExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRedirectUrisEnforcerExecutor.java @@ -28,7 +28,6 @@ import java.util.HashSet; import java.util.List; import java.util.function.Predicate; -import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.models.ClientModel; @@ -48,6 +47,7 @@ import org.keycloak.services.clientpolicy.context.PreAuthorizationRequestContext import org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory.UriType; import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; public class SecureRedirectUrisEnforcerExecutor implements ClientPolicyExecutorProvider { diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRequestObjectExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRequestObjectExecutor.java index 0e97afdabf9..6899d39aec1 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRequestObjectExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureRequestObjectExecutor.java @@ -17,15 +17,12 @@ package org.keycloak.services.clientpolicy.executor; -import static org.keycloak.OAuthErrorException.INVALID_REQUEST_OBJECT; - import java.util.ArrayList; import java.util.List; import java.util.Optional; import jakarta.ws.rs.core.MultivaluedMap; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; @@ -39,6 +36,9 @@ import org.keycloak.services.clientpolicy.context.AuthorizationRequestContext; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; + +import static org.keycloak.OAuthErrorException.INVALID_REQUEST_OBJECT; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureResponseTypeExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureResponseTypeExecutor.java index 29fb0e0a5b1..a8da342cdc0 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureResponseTypeExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureResponseTypeExecutor.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.OIDCConfigAttributes; @@ -36,6 +35,7 @@ import org.keycloak.services.clientpolicy.context.AuthorizationRequestContext; import org.keycloak.services.clientpolicy.context.ClientCRUDContext; import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSessionEnforceExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSessionEnforceExecutor.java index da9a0b6cf96..f0613eaa84e 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSessionEnforceExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSessionEnforceExecutor.java @@ -17,7 +17,6 @@ package org.keycloak.services.clientpolicy.executor; -import org.jboss.logging.Logger; import org.keycloak.OAuthErrorException; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.endpoints.request.AuthorizationEndpointRequest; @@ -28,6 +27,8 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.AuthorizationRequestContext; import org.keycloak.util.TokenUtil; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmExecutor.java index ee552f31925..d5ddbd836cb 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmExecutor.java @@ -23,8 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.jboss.logging.Logger; - import org.keycloak.OAuthErrorException; import org.keycloak.crypto.Algorithm; import org.keycloak.models.KeycloakSession; @@ -39,6 +37,7 @@ import org.keycloak.services.clientpolicy.context.DynamicClientRegisterContext; import org.keycloak.services.clientpolicy.context.DynamicClientUpdateContext; import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; /** * @author Takashi Norimatsu diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutor.java index 8a5af04a743..f7bb92206c2 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutor.java @@ -19,11 +19,10 @@ package org.keycloak.services.clientpolicy.executor; import java.util.Optional; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.common.util.ObjectUtil; +import org.keycloak.http.HttpRequest; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; import org.keycloak.models.KeycloakSession; @@ -32,6 +31,7 @@ import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyException; import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; public class SecureSigningAlgorithmForSignedJwtExecutor implements ClientPolicyExecutorProvider { diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutorFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutorFactory.java index c6d71465050..03199bbbbc2 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutorFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SecureSigningAlgorithmForSignedJwtExecutorFactory.java @@ -17,15 +17,15 @@ package org.keycloak.services.clientpolicy.executor; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import org.keycloak.Config.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - public class SecureSigningAlgorithmForSignedJwtExecutorFactory implements ClientPolicyExecutorProviderFactory { public static final String PROVIDER_ID = "secure-signature-algorithm-signed-jwt"; diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SuppressRefreshTokenRotationExecutor.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SuppressRefreshTokenRotationExecutor.java index df725c1c139..d41c7bf304d 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/SuppressRefreshTokenRotationExecutor.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/SuppressRefreshTokenRotationExecutor.java @@ -17,7 +17,6 @@ package org.keycloak.services.clientpolicy.executor; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.TokenManager; import org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation; @@ -26,6 +25,8 @@ import org.keycloak.services.clientpolicy.ClientPolicyEvent; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.TokenRefreshResponseContext; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/services/src/main/java/org/keycloak/services/clientpolicy/executor/UseLightweightAccessTokenExecutorFactory.java b/services/src/main/java/org/keycloak/services/clientpolicy/executor/UseLightweightAccessTokenExecutorFactory.java index a3f6322c47d..9573a1c97c0 100644 --- a/services/src/main/java/org/keycloak/services/clientpolicy/executor/UseLightweightAccessTokenExecutorFactory.java +++ b/services/src/main/java/org/keycloak/services/clientpolicy/executor/UseLightweightAccessTokenExecutorFactory.java @@ -17,14 +17,14 @@ package org.keycloak.services.clientpolicy.executor; +import java.util.Collections; +import java.util.List; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.List; - public class UseLightweightAccessTokenExecutorFactory implements ClientPolicyExecutorProviderFactory { public static final String PROVIDER_ID = "use-lightweight-access-token"; diff --git a/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java index ef271b7bb8a..b0b98055abd 100755 --- a/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/AbstractClientRegistrationProvider.java @@ -28,6 +28,9 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.core.Response; + import org.keycloak.events.Details; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; @@ -54,9 +57,6 @@ import org.keycloak.services.managers.ClientManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.validation.ValidationUtil; -import jakarta.ws.rs.ForbiddenException; -import jakarta.ws.rs.core.Response; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/clientregistration/AdapterInstallationClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/AdapterInstallationClientRegistrationProvider.java index fe1fd8fe9bd..8913f93261a 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/AdapterInstallationClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/AdapterInstallationClientRegistrationProvider.java @@ -17,13 +17,6 @@ package org.keycloak.services.clientregistration; -import org.keycloak.events.EventBuilder; -import org.keycloak.events.EventType; -import org.keycloak.models.ClientModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.services.managers.ClientManager; -import org.keycloak.services.managers.RealmManager; - import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; @@ -31,6 +24,13 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; +import org.keycloak.events.EventBuilder; +import org.keycloak.events.EventType; +import org.keycloak.models.ClientModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.services.managers.ClientManager; +import org.keycloak.services.managers.RealmManager; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationAuth.java b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationAuth.java index 9d6d82d06c7..10d260879fc 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationAuth.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationAuth.java @@ -17,9 +17,16 @@ package org.keycloak.services.clientregistration; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.AuthenticationProcessor; @@ -47,12 +54,6 @@ import org.keycloak.services.clientregistration.policy.RegistrationAuth; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.util.TokenUtil; -import java.util.Arrays; -import java.util.Collections; -import java.util.Map; -import java.util.Optional; -import java.util.Set; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationService.java b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationService.java index d32c6ba0b0e..36bdabe7978 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationService.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationService.java @@ -17,15 +17,15 @@ package org.keycloak.services.clientregistration; -import org.keycloak.events.EventBuilder; -import org.keycloak.models.KeycloakSession; -import org.keycloak.services.ErrorResponseException; - import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.core.Response; +import org.keycloak.events.EventBuilder; +import org.keycloak.models.KeycloakSession; +import org.keycloak.services.ErrorResponseException; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java index 20dd47b82a8..fcee6176299 100755 --- a/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/ClientRegistrationTokenUtils.java @@ -17,12 +17,16 @@ package org.keycloak.services.clientregistration; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.keycloak.TokenCategory; import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; import org.keycloak.common.util.SecretGenerator; -import org.keycloak.crypto.SignatureSignerContext; import org.keycloak.crypto.SignatureProvider; +import org.keycloak.crypto.SignatureSignerContext; import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.models.ClientInitialAccessModel; @@ -36,10 +40,6 @@ import org.keycloak.services.Urls; import org.keycloak.services.clientregistration.policy.RegistrationAuth; import org.keycloak.util.TokenUtil; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java index 4fb7c67ef5e..793cd814deb 100755 --- a/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/DefaultClientRegistrationProvider.java @@ -17,11 +17,7 @@ package org.keycloak.services.clientregistration; -import org.keycloak.models.ClientModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.utils.RepresentationToModel; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; +import java.net.URI; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -33,7 +29,12 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.net.URI; + +import org.keycloak.models.ClientModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.utils.RepresentationToModel; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/clientregistration/InitialAccessToken.java b/services/src/main/java/org/keycloak/services/clientregistration/InitialAccessToken.java index 137403f59f4..1c53a344094 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/InitialAccessToken.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/InitialAccessToken.java @@ -17,10 +17,11 @@ package org.keycloak.services.clientregistration; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Set; + import org.keycloak.representations.JsonWebToken; -import java.util.Set; +import com.fasterxml.jackson.annotation.JsonProperty; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/services/clientregistration/RegistrationAccessToken.java b/services/src/main/java/org/keycloak/services/clientregistration/RegistrationAccessToken.java index 061541e7e82..7a88dc4141a 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/RegistrationAccessToken.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/RegistrationAccessToken.java @@ -17,10 +17,11 @@ package org.keycloak.services.clientregistration; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Set; + import org.keycloak.representations.JsonWebToken; -import java.util.Set; +import com.fasterxml.jackson.annotation.JsonProperty; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/services/clientregistration/oidc/DescriptionConverter.java b/services/src/main/java/org/keycloak/services/clientregistration/oidc/DescriptionConverter.java index ecc130c2dfd..062fd343737 100755 --- a/services/src/main/java/org/keycloak/services/clientregistration/oidc/DescriptionConverter.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/oidc/DescriptionConverter.java @@ -17,6 +17,20 @@ package org.keycloak.services.clientregistration.oidc; +import java.io.IOException; +import java.net.URI; +import java.security.PublicKey; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.ClientAuthenticator; import org.keycloak.authentication.ClientAuthenticatorFactory; @@ -52,20 +66,6 @@ import org.keycloak.util.JWKSUtils; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; -import java.io.IOException; -import java.net.URI; -import java.security.PublicKey; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import static org.keycloak.OAuth2Constants.AUTHORIZATION_CODE; import static org.keycloak.OAuth2Constants.IMPLICIT; import static org.keycloak.models.CibaConfig.OIDC_CIBA_GRANT_ENABLED; diff --git a/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java b/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java index a0905255a83..316d51fa597 100755 --- a/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/oidc/OIDCClientRegistrationProvider.java @@ -16,6 +16,25 @@ */ package org.keycloak.services.clientregistration.oidc; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.common.util.Time; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientSecretConstants; @@ -42,25 +61,6 @@ import org.keycloak.services.clientregistration.ErrorCodes; import org.keycloak.services.cors.Cors; import org.keycloak.urls.UrlType; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.OPTIONS; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; - -import java.net.URI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.stream.Collectors; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/clientregistration/policy/ClientRegistrationPolicyManager.java b/services/src/main/java/org/keycloak/services/clientregistration/policy/ClientRegistrationPolicyManager.java index 7090011b9a9..dc1fdf7c15b 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/policy/ClientRegistrationPolicyManager.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/policy/ClientRegistrationPolicyManager.java @@ -19,7 +19,6 @@ package org.keycloak.services.clientregistration.policy; import java.util.Objects; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.events.Details; import org.keycloak.models.ClientModel; @@ -29,6 +28,8 @@ import org.keycloak.services.ServicesLogger; import org.keycloak.services.clientregistration.ClientRegistrationContext; import org.keycloak.services.clientregistration.ClientRegistrationProvider; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ClientScopesClientRegistrationPolicy.java b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ClientScopesClientRegistrationPolicy.java index d4356c33b5a..47a8111f3cf 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ClientScopesClientRegistrationPolicy.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ClientScopesClientRegistrationPolicy.java @@ -22,7 +22,6 @@ import java.util.LinkedList; import java.util.List; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; @@ -33,6 +32,8 @@ import org.keycloak.services.clientregistration.ClientRegistrationProvider; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyException; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ConsentRequiredClientRegistrationPolicy.java b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ConsentRequiredClientRegistrationPolicy.java index db3ee1d76a3..7aeae25465b 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ConsentRequiredClientRegistrationPolicy.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ConsentRequiredClientRegistrationPolicy.java @@ -70,4 +70,3 @@ public class ConsentRequiredClientRegistrationPolicy implements ClientRegistrati } } - diff --git a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ProtocolMappersClientRegistrationPolicy.java b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ProtocolMappersClientRegistrationPolicy.java index 980105b6e5b..f33c031f940 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ProtocolMappersClientRegistrationPolicy.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ProtocolMappersClientRegistrationPolicy.java @@ -22,7 +22,6 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -34,6 +33,8 @@ import org.keycloak.services.clientregistration.ClientRegistrationProvider; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyException; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/RegistrationWebOriginsPolicy.java b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/RegistrationWebOriginsPolicy.java index 0b466bf35bb..81ba65e34f7 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/RegistrationWebOriginsPolicy.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/RegistrationWebOriginsPolicy.java @@ -1,5 +1,7 @@ package org.keycloak.services.clientregistration.policy.impl; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -9,8 +11,6 @@ import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyException; import org.keycloak.services.cors.Cors; -import java.util.List; - public class RegistrationWebOriginsPolicy implements ClientRegistrationPolicy { private final KeycloakSession session; diff --git a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/RegistrationWebOriginsPolicyFactory.java b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/RegistrationWebOriginsPolicyFactory.java index eb92d5bc654..ad6f50de37d 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/RegistrationWebOriginsPolicyFactory.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/RegistrationWebOriginsPolicyFactory.java @@ -1,13 +1,13 @@ package org.keycloak.services.clientregistration.policy.impl; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.services.clientregistration.policy.AbstractClientRegistrationPolicyFactory; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy; -import java.util.List; - public class RegistrationWebOriginsPolicyFactory extends AbstractClientRegistrationPolicyFactory { public static final String PROVIDER_ID = "registration-web-origins"; diff --git a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ScopeClientRegistrationPolicy.java b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ScopeClientRegistrationPolicy.java index b053acc89f6..5ba5ca2be1b 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ScopeClientRegistrationPolicy.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/ScopeClientRegistrationPolicy.java @@ -17,7 +17,6 @@ package org.keycloak.services.clientregistration.policy.impl; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -26,6 +25,8 @@ import org.keycloak.services.clientregistration.ClientRegistrationProvider; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyException; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/TrustedHostClientRegistrationPolicy.java b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/TrustedHostClientRegistrationPolicy.java index c2ea30c423c..0cd19f676c6 100644 --- a/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/TrustedHostClientRegistrationPolicy.java +++ b/services/src/main/java/org/keycloak/services/clientregistration/policy/impl/TrustedHostClientRegistrationPolicy.java @@ -28,7 +28,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; @@ -40,6 +39,8 @@ import org.keycloak.services.clientregistration.ClientRegistrationProvider; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicy; import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyException; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/clienttype/DefaultClientTypeManager.java b/services/src/main/java/org/keycloak/services/clienttype/DefaultClientTypeManager.java index 0cdd9c7839f..a379c25b702 100644 --- a/services/src/main/java/org/keycloak/services/clienttype/DefaultClientTypeManager.java +++ b/services/src/main/java/org/keycloak/services/clienttype/DefaultClientTypeManager.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.jboss.logging.Logger; import org.keycloak.client.clienttype.ClientType; import org.keycloak.client.clienttype.ClientTypeException; import org.keycloak.client.clienttype.ClientTypeManager; @@ -37,6 +36,8 @@ import org.keycloak.representations.idm.ClientTypesRepresentation; import org.keycloak.services.clienttype.client.TypeAwareClientModelDelegate; import org.keycloak.util.JsonSerialization; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/clienttype/DefaultClientTypeManagerFactory.java b/services/src/main/java/org/keycloak/services/clienttype/DefaultClientTypeManagerFactory.java index 491d2cdddc9..fdc9d0185d9 100644 --- a/services/src/main/java/org/keycloak/services/clienttype/DefaultClientTypeManagerFactory.java +++ b/services/src/main/java/org/keycloak/services/clienttype/DefaultClientTypeManagerFactory.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.util.Collections; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.client.clienttype.ClientTypeException; import org.keycloak.client.clienttype.ClientTypeManager; @@ -34,6 +33,8 @@ import org.keycloak.representations.idm.ClientTypeRepresentation; import org.keycloak.representations.idm.ClientTypesRepresentation; import org.keycloak.util.JsonSerialization; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/clienttype/client/TypeAwareClientModelDelegate.java b/services/src/main/java/org/keycloak/services/clienttype/client/TypeAwareClientModelDelegate.java index 5e44aaed923..9e5f3219bfd 100644 --- a/services/src/main/java/org/keycloak/services/clienttype/client/TypeAwareClientModelDelegate.java +++ b/services/src/main/java/org/keycloak/services/clienttype/client/TypeAwareClientModelDelegate.java @@ -24,9 +24,9 @@ import java.util.Set; import java.util.function.Supplier; import java.util.stream.Collectors; +import org.keycloak.client.clienttype.ClientType; import org.keycloak.models.ClientModel; import org.keycloak.models.delegate.ClientModelLazyDelegate; -import org.keycloak.client.clienttype.ClientType; /** * Delegates to client-type and underlying delegate diff --git a/services/src/main/java/org/keycloak/services/clienttype/client/TypedClientAttribute.java b/services/src/main/java/org/keycloak/services/clienttype/client/TypedClientAttribute.java index 5b76f1872dc..944adce74de 100644 --- a/services/src/main/java/org/keycloak/services/clienttype/client/TypedClientAttribute.java +++ b/services/src/main/java/org/keycloak/services/clienttype/client/TypedClientAttribute.java @@ -1,9 +1,5 @@ package org.keycloak.services.clienttype.client; -import org.jboss.logging.Logger; -import org.keycloak.client.clienttype.ClientType; -import org.keycloak.client.clienttype.ClientTypeException; - import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -12,6 +8,11 @@ import java.util.Set; import java.util.function.Consumer; import java.util.function.Supplier; +import org.keycloak.client.clienttype.ClientType; +import org.keycloak.client.clienttype.ClientTypeException; + +import org.jboss.logging.Logger; + enum TypedClientSimpleAttribute implements TypedClientAttribute { // Top Level client attributes STANDARD_FLOW_ENABLED("standardFlowEnabled", false), diff --git a/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientType.java b/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientType.java index 681d4b97d89..a2f810a6658 100644 --- a/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientType.java +++ b/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientType.java @@ -18,15 +18,15 @@ package org.keycloak.services.clienttype.impl; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.client.clienttype.ClientType; import org.keycloak.models.ClientModel; import org.keycloak.representations.idm.ClientTypeRepresentation; import org.keycloak.services.clienttype.client.TypeAwareClientModelDelegate; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientTypeProvider.java b/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientTypeProvider.java index 90d44444e6f..bee0866fca4 100644 --- a/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientTypeProvider.java +++ b/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientTypeProvider.java @@ -20,11 +20,12 @@ package org.keycloak.services.clienttype.impl; import java.util.Map; -import org.jboss.logging.Logger; -import org.keycloak.representations.idm.ClientTypeRepresentation; import org.keycloak.client.clienttype.ClientType; import org.keycloak.client.clienttype.ClientTypeException; import org.keycloak.client.clienttype.ClientTypeProvider; +import org.keycloak.representations.idm.ClientTypeRepresentation; + +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientTypeProviderFactory.java b/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientTypeProviderFactory.java index 04c7af37f31..47f3261a080 100644 --- a/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientTypeProviderFactory.java +++ b/services/src/main/java/org/keycloak/services/clienttype/impl/DefaultClientTypeProviderFactory.java @@ -19,12 +19,12 @@ package org.keycloak.services.clienttype.impl; import org.keycloak.Config; +import org.keycloak.client.clienttype.ClientTypeProvider; +import org.keycloak.client.clienttype.ClientTypeProviderFactory; import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.EnvironmentDependentProviderFactory; -import org.keycloak.client.clienttype.ClientTypeProvider; -import org.keycloak.client.clienttype.ClientTypeProviderFactory; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/services/cors/DefaultCors.java b/services/src/main/java/org/keycloak/services/cors/DefaultCors.java index 91863e04ed0..3e1378f99bc 100755 --- a/services/src/main/java/org/keycloak/services/cors/DefaultCors.java +++ b/services/src/main/java/org/keycloak/services/cors/DefaultCors.java @@ -26,16 +26,17 @@ import java.util.Set; import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.core.Response.ResponseBuilder; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; import org.keycloak.common.util.CollectionUtil; import org.keycloak.common.util.UriUtils; +import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.utils.WebOriginsUtils; import org.keycloak.representations.AccessToken; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/cors/DefaultCorsFactory.java b/services/src/main/java/org/keycloak/services/cors/DefaultCorsFactory.java index 40904c2c340..84686d7f631 100644 --- a/services/src/main/java/org/keycloak/services/cors/DefaultCorsFactory.java +++ b/services/src/main/java/org/keycloak/services/cors/DefaultCorsFactory.java @@ -17,17 +17,17 @@ package org.keycloak.services.cors; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - /** * @author Dmitry Telegin */ diff --git a/services/src/main/java/org/keycloak/services/error/KcUnrecognizedPropertyExceptionHandler.java b/services/src/main/java/org/keycloak/services/error/KcUnrecognizedPropertyExceptionHandler.java index f2b6617c4b5..e9d9878e7a2 100644 --- a/services/src/main/java/org/keycloak/services/error/KcUnrecognizedPropertyExceptionHandler.java +++ b/services/src/main/java/org/keycloak/services/error/KcUnrecognizedPropertyExceptionHandler.java @@ -18,8 +18,6 @@ package org.keycloak.services.error; -import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; - import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.Response; @@ -28,6 +26,8 @@ import jakarta.ws.rs.ext.Provider; import org.keycloak.models.KeycloakSession; +import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; + /** * Override explicitly added ExceptionMapper for handling UnrecognizedPropertyException in RestEasy Jackson * diff --git a/services/src/main/java/org/keycloak/services/error/KeycloakErrorHandler.java b/services/src/main/java/org/keycloak/services/error/KeycloakErrorHandler.java index abe70519237..41779646ab6 100644 --- a/services/src/main/java/org/keycloak/services/error/KeycloakErrorHandler.java +++ b/services/src/main/java/org/keycloak/services/error/KeycloakErrorHandler.java @@ -1,13 +1,23 @@ package org.keycloak.services.error; -import static org.keycloak.services.resources.KeycloakApplication.getSessionFactory; +import java.io.IOException; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.regex.Matcher; +import java.util.regex.Pattern; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonProcessingException; import jakarta.validation.ValidationException; -import org.jboss.logging.Logger; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; + import org.keycloak.Config; import org.keycloak.OAuthErrorException; +import org.keycloak.forms.login.MessageType; import org.keycloak.forms.login.freemarker.model.UrlBean; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionTaskWithResult; @@ -26,25 +36,16 @@ import org.keycloak.theme.beans.AdvancedMessageFormatterMethod; import org.keycloak.theme.beans.LocaleBean; import org.keycloak.theme.beans.MessageBean; import org.keycloak.theme.beans.MessageFormatterMethod; -import org.keycloak.forms.login.MessageType; import org.keycloak.theme.freemarker.FreeMarkerProvider; import org.keycloak.utils.KeycloakSessionUtil; import org.keycloak.utils.MediaType; import org.keycloak.utils.MediaTypeMatcher; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.ext.ExceptionMapper; -import jakarta.ws.rs.ext.Provider; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.jboss.logging.Logger; -import java.io.IOException; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import static org.keycloak.services.resources.KeycloakApplication.getSessionFactory; @Provider public class KeycloakErrorHandler implements ExceptionMapper { diff --git a/services/src/main/java/org/keycloak/services/error/KeycloakMismatchedInputExceptionHandler.java b/services/src/main/java/org/keycloak/services/error/KeycloakMismatchedInputExceptionHandler.java index b7497db104c..b7269f88afe 100644 --- a/services/src/main/java/org/keycloak/services/error/KeycloakMismatchedInputExceptionHandler.java +++ b/services/src/main/java/org/keycloak/services/error/KeycloakMismatchedInputExceptionHandler.java @@ -19,7 +19,6 @@ package org.keycloak.services.error; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.ext.ExceptionMapper; @@ -27,6 +26,8 @@ import jakarta.ws.rs.ext.Provider; import org.keycloak.models.KeycloakSession; +import com.fasterxml.jackson.databind.exc.MismatchedInputException; + /** * Override explicitly added ExceptionMapper for handling {@link MismatchedInputException} in RestEasy Jackson */ diff --git a/services/src/main/java/org/keycloak/services/filters/InvalidQueryParameterFilter.java b/services/src/main/java/org/keycloak/services/filters/InvalidQueryParameterFilter.java index 76bf5ff5eb7..8e142f86e41 100644 --- a/services/src/main/java/org/keycloak/services/filters/InvalidQueryParameterFilter.java +++ b/services/src/main/java/org/keycloak/services/filters/InvalidQueryParameterFilter.java @@ -1,16 +1,17 @@ package org.keycloak.services.filters; +import java.io.IOException; +import java.util.List; +import java.util.Map; + import jakarta.annotation.Priority; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.container.ContainerRequestFilter; import jakarta.ws.rs.container.PreMatching; import jakarta.ws.rs.ext.Provider; -import org.jboss.logging.Logger; -import java.io.IOException; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; @Provider @PreMatching diff --git a/services/src/main/java/org/keycloak/services/filters/KeycloakSecurityHeadersFilter.java b/services/src/main/java/org/keycloak/services/filters/KeycloakSecurityHeadersFilter.java index 6be9da43d2c..4a927ab1abd 100644 --- a/services/src/main/java/org/keycloak/services/filters/KeycloakSecurityHeadersFilter.java +++ b/services/src/main/java/org/keycloak/services/filters/KeycloakSecurityHeadersFilter.java @@ -16,18 +16,17 @@ */ package org.keycloak.services.filters; -import org.keycloak.headers.SecurityHeadersProvider; -import org.keycloak.models.KeycloakSession; -import org.keycloak.utils.KeycloakSessionUtil; - -import jakarta.ws.rs.container.ContainerRequestContext; - import jakarta.annotation.Priority; +import jakarta.ws.rs.container.ContainerRequestContext; import jakarta.ws.rs.container.ContainerResponseContext; import jakarta.ws.rs.container.ContainerResponseFilter; import jakarta.ws.rs.container.PreMatching; import jakarta.ws.rs.ext.Provider; +import org.keycloak.headers.SecurityHeadersProvider; +import org.keycloak.models.KeycloakSession; +import org.keycloak.utils.KeycloakSessionUtil; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/logging/DefaultMappedDiagnosticContextProviderFactory.java b/services/src/main/java/org/keycloak/services/logging/DefaultMappedDiagnosticContextProviderFactory.java index 78d573e28d5..67a167e8b69 100644 --- a/services/src/main/java/org/keycloak/services/logging/DefaultMappedDiagnosticContextProviderFactory.java +++ b/services/src/main/java/org/keycloak/services/logging/DefaultMappedDiagnosticContextProviderFactory.java @@ -1,6 +1,12 @@ package org.keycloak.services.logging; -import org.jboss.logging.MDC; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.logging.MappedDiagnosticContextProvider; @@ -18,12 +24,7 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.sessions.AuthenticationSessionModel; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.MDC; /** * The default provider factory can be configured via --spi-mapped-diagnostic-context-default-mdc-keys to define mdc 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 97fe9c4b798..446630ca9a8 100755 --- a/services/src/main/java/org/keycloak/services/managers/AppAuthManager.java +++ b/services/src/main/java/org/keycloak/services/managers/AppAuthManager.java @@ -16,7 +16,12 @@ */ package org.keycloak.services.managers; +import java.util.List; +import java.util.regex.Pattern; + import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.UriInfo; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; @@ -25,15 +30,9 @@ import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; - -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.UriInfo; import org.keycloak.services.util.DPoPUtil; import org.keycloak.util.TokenUtil; -import java.util.List; -import java.util.regex.Pattern; - /** * @author Bill Burke * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/managers/Auth.java b/services/src/main/java/org/keycloak/services/managers/Auth.java index d65a0fd7590..2bc081d53e7 100755 --- a/services/src/main/java/org/keycloak/services/managers/Auth.java +++ b/services/src/main/java/org/keycloak/services/managers/Auth.java @@ -17,6 +17,8 @@ package org.keycloak.services.managers; +import jakarta.ws.rs.ForbiddenException; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; @@ -24,8 +26,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.representations.AccessToken; -import jakarta.ws.rs.ForbiddenException; - /** * @author Stian Thorgersen */ 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 f34ec5a5414..9dbe3953a4c 100755 --- a/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java +++ b/services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java @@ -16,14 +16,33 @@ */ package org.keycloak.services.managers; -import org.jboss.logging.Logger; +import java.net.URI; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.function.Consumer; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; + +import org.keycloak.OAuth2Constants; import org.keycloak.Token; import org.keycloak.TokenCategory; -import org.keycloak.broker.provider.IdentityBrokerException; -import org.keycloak.cookie.CookieProvider; -import org.keycloak.cookie.CookieType; -import org.keycloak.http.HttpRequest; -import org.keycloak.OAuth2Constants; import org.keycloak.TokenVerifier; import org.keycloak.TokenVerifier.TokenTypeCheck; import org.keycloak.authentication.AuthenticationFlowException; @@ -35,6 +54,7 @@ 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.broker.provider.IdentityBrokerException; import org.keycloak.broker.provider.UserAuthenticationIdentityProvider; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; @@ -42,6 +62,8 @@ import org.keycloak.common.VerificationException; import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.SecretGenerator; import org.keycloak.common.util.Time; +import org.keycloak.cookie.CookieProvider; +import org.keycloak.cookie.CookieType; import org.keycloak.crypto.SignatureProvider; import org.keycloak.crypto.SignatureVerifierContext; import org.keycloak.events.Details; @@ -49,18 +71,19 @@ import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; import org.keycloak.forms.login.LoginFormsProvider; +import org.keycloak.http.HttpRequest; import org.keycloak.jose.jws.crypto.HashUtils; -import org.keycloak.models.KeycloakContext; -import org.keycloak.models.SingleUseObjectKeyModel; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.ClientSessionContext; import org.keycloak.models.Constants; import org.keycloak.models.DefaultActionTokenKey; +import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RequiredActionProviderModel; +import org.keycloak.models.SingleUseObjectKeyModel; import org.keycloak.models.SingleUseObjectProvider; import org.keycloak.models.UserConsentModel; import org.keycloak.models.UserModel; @@ -97,30 +120,9 @@ import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.sessions.CommonClientSessionModel.Action; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.TokenUtil; - -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.NewCookie; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; import org.keycloak.utils.RoleResolveUtil; -import java.net.URI; -import java.net.URLDecoder; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; + +import org.jboss.logging.Logger; import static org.keycloak.models.UserSessionModel.CORRESPONDING_SESSION_ID; import static org.keycloak.protocol.oidc.grants.device.DeviceGrantType.isOAuth2DeviceVerificationFlow; diff --git a/services/src/main/java/org/keycloak/services/managers/AuthenticationSessionManager.java b/services/src/main/java/org/keycloak/services/managers/AuthenticationSessionManager.java index 01ceaf8038f..8f132104e5e 100644 --- a/services/src/main/java/org/keycloak/services/managers/AuthenticationSessionManager.java +++ b/services/src/main/java/org/keycloak/services/managers/AuthenticationSessionManager.java @@ -20,7 +20,6 @@ package org.keycloak.services.managers; import java.nio.charset.StandardCharsets; import java.util.Base64; -import org.jboss.logging.Logger; import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.Time; import org.keycloak.cookie.CookieProvider; @@ -42,6 +41,8 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.sessions.StickySessionEncoderProvider; +import org.jboss.logging.Logger; + import static org.keycloak.services.managers.AuthenticationManager.authenticateIdentityCookie; 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 4e12f1c1de2..f33cfbf157f 100644 --- a/services/src/main/java/org/keycloak/services/managers/ClientManager.java +++ b/services/src/main/java/org/keycloak/services/managers/ClientManager.java @@ -16,9 +16,15 @@ */ package org.keycloak.services.managers; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import org.jboss.logging.Logger; +import java.net.URI; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; +import java.util.stream.Collectors; + import org.keycloak.authentication.ClientAuthenticator; import org.keycloak.authentication.ClientAuthenticatorFactory; import org.keycloak.common.Profile; @@ -43,14 +49,9 @@ import org.keycloak.representations.adapters.config.PolicyEnforcerConfig; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.sessions.AuthenticationSessionProvider; -import java.net.URI; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; -import java.util.stream.Collectors; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import org.jboss.logging.Logger; import static org.keycloak.models.Constants.defaultClients; diff --git a/services/src/main/java/org/keycloak/services/managers/CodeGenerateUtil.java b/services/src/main/java/org/keycloak/services/managers/CodeGenerateUtil.java index 851e21dd387..946317f39a0 100644 --- a/services/src/main/java/org/keycloak/services/managers/CodeGenerateUtil.java +++ b/services/src/main/java/org/keycloak/services/managers/CodeGenerateUtil.java @@ -17,7 +17,11 @@ package org.keycloak.services.managers; -import org.jboss.logging.Logger; +import java.security.MessageDigest; +import java.util.HashMap; +import java.util.Map; +import java.util.function.Supplier; + import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.SecretGenerator; import org.keycloak.events.EventBuilder; @@ -32,10 +36,7 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; -import java.security.MessageDigest; -import java.util.HashMap; -import java.util.Map; -import java.util.function.Supplier; +import org.jboss.logging.Logger; /** * TODO: Remove this and probably also ClientSessionParser. It's unnecessary genericity and abstraction, which is not needed anymore when clientSessionModel was fully removed. diff --git a/services/src/main/java/org/keycloak/services/managers/DefaultBlockingBruteForceProtector.java b/services/src/main/java/org/keycloak/services/managers/DefaultBlockingBruteForceProtector.java index f8a11f49f1d..633e3580ca3 100644 --- a/services/src/main/java/org/keycloak/services/managers/DefaultBlockingBruteForceProtector.java +++ b/services/src/main/java/org/keycloak/services/managers/DefaultBlockingBruteForceProtector.java @@ -16,13 +16,14 @@ */ package org.keycloak.services.managers; -import jakarta.ws.rs.core.UriInfo; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.atomic.AtomicBoolean; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.ClientConnection; import org.keycloak.models.AbstractKeycloakTransaction; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/services/managers/DefaultBruteForceProtector.java b/services/src/main/java/org/keycloak/services/managers/DefaultBruteForceProtector.java index 2b4cb2e9625..08df80e69a0 100644 --- a/services/src/main/java/org/keycloak/services/managers/DefaultBruteForceProtector.java +++ b/services/src/main/java/org/keycloak/services/managers/DefaultBruteForceProtector.java @@ -17,7 +17,18 @@ package org.keycloak.services.managers; -import org.jboss.logging.Logger; +import java.security.cert.X509Certificate; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.concurrent.ExecutorService; + +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.ClientConnection; import org.keycloak.common.util.Time; import org.keycloak.events.Details; @@ -36,16 +47,7 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.ReadOnlyException; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MultivaluedHashMap; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.NewCookie; -import jakarta.ws.rs.core.UriInfo; -import java.security.cert.X509Certificate; -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.concurrent.ExecutorService; +import org.jboss.logging.Logger; import static org.keycloak.models.UserModel.DISABLED_REASON; diff --git a/services/src/main/java/org/keycloak/services/managers/DefaultBruteForceProtectorFactory.java b/services/src/main/java/org/keycloak/services/managers/DefaultBruteForceProtectorFactory.java index daf5e80dec9..f592e050e1b 100755 --- a/services/src/main/java/org/keycloak/services/managers/DefaultBruteForceProtectorFactory.java +++ b/services/src/main/java/org/keycloak/services/managers/DefaultBruteForceProtectorFactory.java @@ -18,6 +18,7 @@ package org.keycloak.services.managers; import java.util.List; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; 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 6749a415070..ed957b42e79 100755 --- a/services/src/main/java/org/keycloak/services/managers/RealmManager.java +++ b/services/src/main/java/org/keycloak/services/managers/RealmManager.java @@ -16,15 +16,22 @@ */ package org.keycloak.services.managers; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Optional; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.common.Profile; import org.keycloak.common.enums.SslRequired; import org.keycloak.common.util.Encode; import org.keycloak.connections.jpa.support.EntityManagers; +import org.keycloak.email.EmailException; import org.keycloak.events.EventListenerProvider; import org.keycloak.events.EventListenerProviderFactory; import org.keycloak.models.AbstractKeycloakTransaction; @@ -62,16 +69,10 @@ import org.keycloak.representations.idm.OAuthClientRepresentation; import org.keycloak.representations.idm.RealmEventsConfigRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RoleRepresentation; +import org.keycloak.services.clientregistration.policy.DefaultClientRegistrationPolicies; import org.keycloak.sessions.AuthenticationSessionProvider; import org.keycloak.storage.StoreMigrateRepresentationEvent; import org.keycloak.storage.StoreSyncEvent; -import org.keycloak.services.clientregistration.policy.DefaultClientRegistrationPolicies; - -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Optional; -import org.keycloak.email.EmailException; import org.keycloak.utils.ReservedCharValidator; import org.keycloak.utils.SMTPUtil; import org.keycloak.utils.StringUtil; 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 28346bcfaf7..77d75c8c6d7 100755 --- a/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java +++ b/services/src/main/java/org/keycloak/services/managers/ResourceAdminManager.java @@ -16,12 +16,20 @@ */ package org.keycloak.services.managers; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.OAuth2Constants; import org.keycloak.TokenIdGenerator; import org.keycloak.common.util.KeycloakUriBuilder; @@ -45,20 +53,14 @@ import org.keycloak.representations.adapters.action.TestAvailabilityAction; import org.keycloak.services.ServicesLogger; import org.keycloak.services.util.ResolveRelative; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/managers/UserConsentManager.java b/services/src/main/java/org/keycloak/services/managers/UserConsentManager.java index fac68442ced..28f9eaf164d 100644 --- a/services/src/main/java/org/keycloak/services/managers/UserConsentManager.java +++ b/services/src/main/java/org/keycloak/services/managers/UserConsentManager.java @@ -18,6 +18,8 @@ package org.keycloak.services.managers; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ModelException; @@ -25,7 +27,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserConsentModel; import org.keycloak.models.UserModel; import org.keycloak.models.light.LightweightUserAdapter; -import java.util.stream.Stream; + import static org.keycloak.models.light.LightweightUserAdapter.isLightweightUser; /** 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 92749e95ebd..652e66fb114 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,12 @@ */ package org.keycloak.services.managers; -import org.jboss.logging.Logger; +import java.util.List; +import java.util.Set; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.common.util.Time; import org.keycloak.device.DeviceActivityManager; @@ -31,11 +36,7 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.services.ServicesLogger; -import java.util.List; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; /** diff --git a/services/src/main/java/org/keycloak/services/migration/DefaultMigrationProvider.java b/services/src/main/java/org/keycloak/services/migration/DefaultMigrationProvider.java index 95274804185..a115e0b7502 100755 --- a/services/src/main/java/org/keycloak/services/migration/DefaultMigrationProvider.java +++ b/services/src/main/java/org/keycloak/services/migration/DefaultMigrationProvider.java @@ -17,6 +17,11 @@ package org.keycloak.services.migration; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + import org.keycloak.migration.MigrationProvider; import org.keycloak.models.ClaimMask; import org.keycloak.models.ClientScopeModel; @@ -30,11 +35,6 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory; import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.services.managers.RealmManager; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - /** * Various common utils needed for migration from older version to newer * 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 00adfab487e..3938d941496 100755 --- a/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java +++ b/services/src/main/java/org/keycloak/services/resources/AbstractSecuredLocalService.java @@ -16,21 +16,8 @@ */ package org.keycloak.services.resources; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; -import org.keycloak.AbstractOAuthClient; -import org.keycloak.OAuth2Constants; -import org.keycloak.OAuthErrorException; -import org.keycloak.common.ClientConnection; -import org.keycloak.common.util.KeycloakUriBuilder; -import org.keycloak.forms.login.LoginFormsProvider; -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.managers.Auth; -import org.keycloak.services.messages.Messages; -import org.keycloak.util.TokenUtil; +import java.net.URI; +import java.util.Set; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.ForbiddenException; @@ -42,8 +29,23 @@ import jakarta.ws.rs.core.NewCookie; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import java.net.URI; -import java.util.Set; + +import org.keycloak.AbstractOAuthClient; +import org.keycloak.OAuth2Constants; +import org.keycloak.OAuthErrorException; +import org.keycloak.common.ClientConnection; +import org.keycloak.common.util.KeycloakUriBuilder; +import org.keycloak.forms.login.LoginFormsProvider; +import org.keycloak.http.HttpRequest; +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.managers.Auth; +import org.keycloak.services.messages.Messages; +import org.keycloak.util.TokenUtil; + +import org.jboss.logging.Logger; /** * Helper class for securing local services. Provides login basics as well as CSRF check basics 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 0dce67aed96..fc0f5b05501 100755 --- a/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java +++ b/services/src/main/java/org/keycloak/services/resources/ClientsManagementService.java @@ -16,26 +16,10 @@ */ package org.keycloak.services.resources; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; -import jakarta.ws.rs.NotAuthorizedException; -import org.keycloak.OAuthErrorException; -import org.keycloak.common.ClientConnection; -import org.keycloak.common.util.Time; -import org.keycloak.constants.AdapterConstants; -import org.keycloak.events.Details; -import org.keycloak.events.Errors; -import org.keycloak.events.EventBuilder; -import org.keycloak.events.EventType; -import org.keycloak.models.ClientModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.protocol.oidc.utils.AuthorizeClientUtil; -import org.keycloak.representations.idm.OAuth2ErrorRepresentation; - import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.NotAuthorizedException; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; @@ -45,6 +29,23 @@ import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; +import org.keycloak.OAuthErrorException; +import org.keycloak.common.ClientConnection; +import org.keycloak.common.util.Time; +import org.keycloak.constants.AdapterConstants; +import org.keycloak.events.Details; +import org.keycloak.events.Errors; +import org.keycloak.events.EventBuilder; +import org.keycloak.events.EventType; +import org.keycloak.http.HttpRequest; +import org.keycloak.models.ClientModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.protocol.oidc.utils.AuthorizeClientUtil; +import org.keycloak.representations.idm.OAuth2ErrorRepresentation; + +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ 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 90e80e34119..67920fd6b10 100755 --- a/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java +++ b/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java @@ -16,27 +16,52 @@ */ package org.keycloak.services.resources; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.authentication.RequiredActionContext; -import org.keycloak.authentication.authenticators.broker.IdpConfirmOverrideLinkAuthenticator; -import org.keycloak.broker.provider.ExchangeTokenToIdentityProviderToken; -import org.keycloak.broker.provider.IdpLinkAction; -import org.keycloak.broker.provider.UserAuthenticationIdentityProvider; -import org.keycloak.http.HttpRequest; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Iterator; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; +import java.util.function.Consumer; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.OAuthErrorException; import org.keycloak.authentication.AuthenticationProcessor; +import org.keycloak.authentication.RequiredActionContext; import org.keycloak.authentication.authenticators.broker.AbstractIdpAuthenticator; +import org.keycloak.authentication.authenticators.broker.IdpConfirmOverrideLinkAuthenticator; import org.keycloak.authentication.authenticators.broker.util.PostBrokerLoginConstants; import org.keycloak.authentication.authenticators.broker.util.SerializedBrokeredIdentityContext; import org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator; import org.keycloak.broker.provider.AuthenticationRequest; import org.keycloak.broker.provider.BrokeredIdentityContext; +import org.keycloak.broker.provider.ExchangeTokenToIdentityProviderToken; import org.keycloak.broker.provider.IdentityBrokerException; import org.keycloak.broker.provider.IdentityProvider; import org.keycloak.broker.provider.IdentityProviderFactory; import org.keycloak.broker.provider.IdentityProviderMapper; import org.keycloak.broker.provider.IdentityProviderMapperSyncModeDelegate; +import org.keycloak.broker.provider.IdpLinkAction; +import org.keycloak.broker.provider.UserAuthenticationIdentityProvider; import org.keycloak.broker.provider.util.IdentityBrokerState; import org.keycloak.broker.saml.SAMLEndpoint; import org.keycloak.broker.social.SocialIdentityProvider; @@ -49,6 +74,7 @@ import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; +import org.keycloak.http.HttpRequest; import org.keycloak.locale.LocaleSelectorProvider; import org.keycloak.models.AccountRoles; import org.keycloak.models.AuthenticatedClientSessionModel; @@ -82,13 +108,13 @@ import org.keycloak.services.ErrorPageException; import org.keycloak.services.ErrorResponse; import org.keycloak.services.ServicesLogger; import org.keycloak.services.Urls; +import org.keycloak.services.cors.Cors; import org.keycloak.services.managers.AppAuthManager; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.services.managers.BruteForceProtector; import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.messages.Messages; -import org.keycloak.services.cors.Cors; import org.keycloak.services.util.AuthenticationFlowURLHelper; import org.keycloak.services.util.BrowserHistoryHelper; import org.keycloak.services.util.CacheControlUtil; @@ -99,32 +125,8 @@ import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.Booleans; import org.keycloak.util.JsonSerialization; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.OPTIONS; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; -import jakarta.ws.rs.core.UriBuilder; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Iterator; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.function.Consumer; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import static org.keycloak.broker.provider.AbstractIdentityProvider.BROKER_REGISTERED_NEW_USER; 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 7bda1864876..d515c446eb5 100644 --- a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java +++ b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java @@ -16,7 +16,13 @@ */ package org.keycloak.services.resources; -import org.jboss.logging.Logger; +import java.util.NoSuchElementException; +import java.util.ServiceLoader; + +import jakarta.transaction.SystemException; +import jakarta.transaction.Transaction; +import jakarta.ws.rs.core.Application; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.common.crypto.CryptoIntegration; @@ -35,12 +41,7 @@ import org.keycloak.platform.PlatformProvider; import org.keycloak.services.managers.ApplianceBootstrap; import org.keycloak.transaction.JtaTransactionManagerLookup; -import java.util.NoSuchElementException; -import java.util.ServiceLoader; - -import jakarta.transaction.SystemException; -import jakarta.transaction.Transaction; -import jakarta.ws.rs.core.Application; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/resources/LoadBalancerResource.java b/services/src/main/java/org/keycloak/services/resources/LoadBalancerResource.java index e18d980743e..d7ae8b2761e 100755 --- a/services/src/main/java/org/keycloak/services/resources/LoadBalancerResource.java +++ b/services/src/main/java/org/keycloak/services/resources/LoadBalancerResource.java @@ -16,7 +16,8 @@ */ package org.keycloak.services.resources; -import io.smallrye.common.annotation.NonBlocking; +import java.util.Set; + import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; @@ -24,12 +25,12 @@ import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.ext.Provider; -import org.jboss.logging.Logger; import org.keycloak.health.LoadBalancerCheckProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.utils.MediaType; -import java.util.Set; +import io.smallrye.common.annotation.NonBlocking; +import org.jboss.logging.Logger; /** * Prepare information for the load balancer (possibly in a multi-site setup) whether this Keycloak cluster should receive traffic. 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 e38c4985c92..7598cb9fb7e 100755 --- a/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java +++ b/services/src/main/java/org/keycloak/services/resources/LoginActionsService.java @@ -16,15 +16,24 @@ */ package org.keycloak.services.resources; +import java.net.URI; +import java.util.Map; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; import jakarta.ws.rs.HEAD; -import org.jboss.logging.Logger; -import org.keycloak.common.Profile; -import org.keycloak.common.Profile.Feature; -import org.keycloak.forms.login.LoginFormsProvider; -import org.keycloak.forms.login.MessageType; -import org.keycloak.forms.login.freemarker.DetachedInfoStateChecker; -import org.keycloak.forms.login.freemarker.DetachedInfoStateCookie; -import org.keycloak.http.HttpRequest; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.OAuth2Constants; import org.keycloak.TokenVerifier; import org.keycloak.authentication.AuthenticationFlowException; @@ -36,7 +45,6 @@ import org.keycloak.authentication.RequiredActionFactory; import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.authentication.actiontoken.ActionTokenContext; import org.keycloak.authentication.actiontoken.ActionTokenHandler; -import org.keycloak.models.DefaultActionTokenKey; import org.keycloak.authentication.actiontoken.ExplainedTokenVerificationException; import org.keycloak.authentication.actiontoken.resetcred.ResetCredentialsActionTokenHandler; import org.keycloak.authentication.authenticators.broker.AbstractIdpAuthenticator; @@ -45,6 +53,8 @@ import org.keycloak.authentication.authenticators.broker.util.SerializedBrokered import org.keycloak.authentication.authenticators.browser.AbstractUsernameFormAuthenticator; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.common.ClientConnection; +import org.keycloak.common.Profile; +import org.keycloak.common.Profile.Feature; import org.keycloak.common.VerificationException; import org.keycloak.common.util.Time; import org.keycloak.common.util.TriFunction; @@ -55,15 +65,21 @@ import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; import org.keycloak.exceptions.TokenNotActiveException; -import org.keycloak.models.KeycloakContext; -import org.keycloak.models.SingleUseObjectKeyModel; +import org.keycloak.forms.login.LoginFormsProvider; +import org.keycloak.forms.login.MessageType; +import org.keycloak.forms.login.freemarker.DetachedInfoStateChecker; +import org.keycloak.forms.login.freemarker.DetachedInfoStateCookie; +import org.keycloak.http.HttpRequest; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.ClientSessionContext; import org.keycloak.models.Constants; +import org.keycloak.models.DefaultActionTokenKey; +import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; +import org.keycloak.models.SingleUseObjectKeyModel; import org.keycloak.models.UserConsentModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; @@ -98,21 +114,7 @@ import org.keycloak.services.util.LocaleUtil; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriBuilderException; -import jakarta.ws.rs.core.UriInfo; -import java.net.URI; -import java.util.Map; +import org.jboss.logging.Logger; import static org.keycloak.authentication.actiontoken.DefaultActionToken.ACTION_TOKEN_BASIC_CHECKS; import static org.keycloak.models.utils.DefaultRequiredActions.getDefaultRequiredActionCaseInsensitively; diff --git a/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceChecks.java b/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceChecks.java index 0cc586d181d..e269c56d180 100644 --- a/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceChecks.java +++ b/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceChecks.java @@ -16,7 +16,11 @@ */ package org.keycloak.services.resources; +import java.util.Objects; +import java.util.function.Consumer; + import jakarta.ws.rs.core.Response; + import org.keycloak.TokenVerifier.Predicate; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.authentication.ExplainedVerificationException; @@ -26,10 +30,10 @@ import org.keycloak.common.VerificationException; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; -import org.keycloak.models.SingleUseObjectKeyModel; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; +import org.keycloak.models.SingleUseObjectKeyModel; import org.keycloak.models.SingleUseObjectProvider; import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; @@ -42,8 +46,7 @@ import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionCompoundId; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.CommonClientSessionModel.Action; -import java.util.Objects; -import java.util.function.Consumer; + import org.jboss.logging.Logger; /** diff --git a/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceException.java b/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceException.java index 92c736e36ee..9399b8efdc3 100644 --- a/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceException.java +++ b/services/src/main/java/org/keycloak/services/resources/LoginActionsServiceException.java @@ -16,9 +16,10 @@ */ package org.keycloak.services.resources; -import org.keycloak.common.VerificationException; import jakarta.ws.rs.core.Response; +import org.keycloak.common.VerificationException; + /** * * @author hmlnarik diff --git a/services/src/main/java/org/keycloak/services/resources/LogoutSessionCodeChecks.java b/services/src/main/java/org/keycloak/services/resources/LogoutSessionCodeChecks.java index 048383a2ebb..187abee1970 100644 --- a/services/src/main/java/org/keycloak/services/resources/LogoutSessionCodeChecks.java +++ b/services/src/main/java/org/keycloak/services/resources/LogoutSessionCodeChecks.java @@ -21,10 +21,10 @@ package org.keycloak.services.resources; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriInfo; -import org.keycloak.http.HttpRequest; import org.keycloak.common.ClientConnection; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; +import org.keycloak.http.HttpRequest; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java b/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java index 12321bad853..41184b0ad90 100755 --- a/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java +++ b/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java @@ -16,18 +16,6 @@ */ package org.keycloak.services.resources; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.http.HttpRequest; -import org.keycloak.http.HttpResponse; -import org.keycloak.common.util.PemUtils; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.protocol.oidc.OIDCLoginProtocolService; -import org.keycloak.representations.idm.PublishedRealmRepresentation; -import org.keycloak.services.cors.Cors; -import org.keycloak.services.Urls; - import jakarta.ws.rs.GET; import jakarta.ws.rs.OPTIONS; import jakarta.ws.rs.Path; @@ -36,6 +24,19 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriInfo; +import org.keycloak.common.util.PemUtils; +import org.keycloak.http.HttpRequest; +import org.keycloak.http.HttpResponse; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.protocol.oidc.OIDCLoginProtocolService; +import org.keycloak.representations.idm.PublishedRealmRepresentation; +import org.keycloak.services.Urls; +import org.keycloak.services.cors.Cors; + +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; + /** * Resource class for public realm information * 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 b4b594e2bd2..9e124e18f56 100755 --- a/services/src/main/java/org/keycloak/services/resources/RealmsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/RealmsResource.java @@ -16,14 +16,29 @@ */ package org.keycloak.services.resources; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; +import java.net.URI; +import java.util.Comparator; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; + import org.keycloak.OAuthErrorException; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.AuthorizationService; import org.keycloak.common.Profile; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.events.EventBuilder; +import org.keycloak.http.HttpRequest; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -41,21 +56,7 @@ import org.keycloak.utils.ProfileHelper; import org.keycloak.wellknown.WellKnownProvider; import org.keycloak.wellknown.WellKnownProviderFactory; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.OPTIONS; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.Context; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; -import jakarta.ws.rs.ext.Provider; - -import java.net.URI; -import java.util.Comparator; +import org.jboss.logging.Logger; import static org.keycloak.utils.MediaType.APPLICATION_JWT; diff --git a/services/src/main/java/org/keycloak/services/resources/ServerMetadataResource.java b/services/src/main/java/org/keycloak/services/resources/ServerMetadataResource.java index 959b2f02898..e0a0a18ed66 100644 --- a/services/src/main/java/org/keycloak/services/resources/ServerMetadataResource.java +++ b/services/src/main/java/org/keycloak/services/resources/ServerMetadataResource.java @@ -27,11 +27,14 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.ext.Provider; -import org.jboss.logging.Logger; + import org.keycloak.models.KeycloakSession; -import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProviderFactory; import org.keycloak.protocol.oauth2.OAuth2WellKnownProviderFactory; +import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProviderFactory; import org.keycloak.services.cors.Cors; + +import org.jboss.logging.Logger; + import static org.keycloak.utils.MediaType.APPLICATION_JWT; diff --git a/services/src/main/java/org/keycloak/services/resources/SessionCodeChecks.java b/services/src/main/java/org/keycloak/services/resources/SessionCodeChecks.java index 294184c9dad..b99626aa638 100644 --- a/services/src/main/java/org/keycloak/services/resources/SessionCodeChecks.java +++ b/services/src/main/java/org/keycloak/services/resources/SessionCodeChecks.java @@ -17,8 +17,6 @@ package org.keycloak.services.resources; -import static org.keycloak.services.managers.AuthenticationManager.authenticateIdentityCookie; - import java.io.IOException; import java.net.URI; @@ -26,8 +24,6 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.common.ClientConnection; import org.keycloak.common.util.ObjectUtil; @@ -35,6 +31,7 @@ import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventBuilder; import org.keycloak.forms.login.LoginFormsProvider; +import org.keycloak.http.HttpRequest; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; @@ -51,12 +48,16 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.services.managers.ClientSessionCode; import org.keycloak.services.messages.Messages; -import org.keycloak.services.util.BrowserHistoryHelper; import org.keycloak.services.util.AuthenticationFlowURLHelper; +import org.keycloak.services.util.BrowserHistoryHelper; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; +import org.jboss.logging.Logger; + +import static org.keycloak.services.managers.AuthenticationManager.authenticateIdentityCookie; + public class SessionCodeChecks { 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 eb481b4b89d..26874643ff1 100644 --- a/services/src/main/java/org/keycloak/services/resources/ThemeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/ThemeResource.java @@ -16,35 +16,6 @@ */ package org.keycloak.services.resources; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.HeaderParam; -import jakarta.ws.rs.OPTIONS; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; -import org.keycloak.common.Profile; -import org.keycloak.common.Version; -import org.keycloak.common.util.MimeTypeUtil; -import org.keycloak.encoding.ResourceEncodingHelper; -import org.keycloak.encoding.ResourceEncodingProvider; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.services.ServicesLogger; -import org.keycloak.services.cors.Cors; -import org.keycloak.services.util.CacheControlUtil; -import org.keycloak.services.util.LocaleUtil; -import org.keycloak.theme.Theme; - -import jakarta.ws.rs.core.Context; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.ext.Provider; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -59,6 +30,36 @@ import java.util.Properties; import java.util.Set; import java.util.regex.Pattern; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; + +import org.keycloak.common.Profile; +import org.keycloak.common.Version; +import org.keycloak.common.util.MimeTypeUtil; +import org.keycloak.encoding.ResourceEncodingHelper; +import org.keycloak.encoding.ResourceEncodingProvider; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.services.ServicesLogger; +import org.keycloak.services.cors.Cors; +import org.keycloak.services.util.CacheControlUtil; +import org.keycloak.services.util.LocaleUtil; +import org.keycloak.theme.Theme; + +import org.jboss.logging.Logger; + import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; 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 b6c51463112..1670bb6bbe4 100755 --- a/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/WelcomeResource.java @@ -16,6 +16,15 @@ */ package org.keycloak.services.resources; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Properties; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.GET; @@ -32,7 +41,6 @@ import jakarta.ws.rs.core.Response.ResponseBuilder; import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.ext.Provider; -import org.jboss.logging.Logger; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; import org.keycloak.common.Version; @@ -53,14 +61,7 @@ import org.keycloak.urls.UrlType; import org.keycloak.utils.MediaType; import org.keycloak.utils.SecureContextResolver; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.Properties; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java b/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java index e61851c28cb..c120146ce1a 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java @@ -1,29 +1,42 @@ package org.keycloak.services.resources.account; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.Scanner; +import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.models.IdentityProviderQuery; + import org.keycloak.authentication.requiredactions.DeleteAccount; import org.keycloak.authentication.requiredactions.UpdateEmail; import org.keycloak.common.Profile; import org.keycloak.common.Version; import org.keycloak.common.util.Environment; -import org.keycloak.models.FederatedIdentityModel; -import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.IdentityProviderStorageProvider; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import org.keycloak.utils.SecureContextResolver; import org.keycloak.models.AccountRoles; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; +import org.keycloak.models.FederatedIdentityModel; +import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderQuery; +import org.keycloak.models.IdentityProviderStorageProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; +import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.utils.RedirectUtils; import org.keycloak.services.Urls; import org.keycloak.services.managers.AppAuthManager; @@ -41,20 +54,9 @@ import org.keycloak.theme.freemarker.FreeMarkerProvider; import org.keycloak.urls.UrlType; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.MediaType; +import org.keycloak.utils.SecureContextResolver; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.Scanner; -import java.util.function.Function; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.resteasy.reactive.NoCache; /** * Created by st on 29/03/17. diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountConsoleFactory.java b/services/src/main/java/org/keycloak/services/resources/account/AccountConsoleFactory.java index a9ffa5ed8f6..de028ef7ac8 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountConsoleFactory.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountConsoleFactory.java @@ -1,17 +1,19 @@ package org.keycloak.services.resources.account; import java.io.IOException; + +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.NotFoundException; + import org.keycloak.Config.Scope; import org.keycloak.models.ClientModel; +import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; import org.keycloak.services.resource.AccountResourceProvider; import org.keycloak.services.resource.AccountResourceProviderFactory; import org.keycloak.theme.Theme; -import jakarta.ws.rs.InternalServerErrorException; -import jakarta.ws.rs.NotFoundException; -import org.keycloak.models.Constants; /** * Provides the {@code default} {@link AccountConsole} implementation backed by the diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java b/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java index 9a6ed0fd84b..c67f97ab022 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java @@ -1,9 +1,29 @@ package org.keycloak.services.resources.account; -import com.fasterxml.jackson.annotation.JsonIgnore; +import java.io.IOException; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; import jakarta.ws.rs.ForbiddenException; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; import org.keycloak.authentication.AuthenticatorUtil; @@ -35,27 +55,9 @@ import org.keycloak.services.messages.Messages; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.MediaType; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Response; -import java.io.IOException; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import static org.keycloak.models.AuthenticationExecutionModel.Requirement.DISABLED; import static org.keycloak.utils.CredentialHelper.createUserStorageCredentialRepresentation; diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java b/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java index aab4dd7ac98..9fccc92d907 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountLoader.java @@ -16,11 +16,24 @@ */ package org.keycloak.services.resources.account; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; -import org.keycloak.http.HttpResponse; +import java.io.IOException; +import java.util.List; + +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.InternalServerErrorException; +import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.enums.AccountRestApiVersion; import org.keycloak.events.EventBuilder; +import org.keycloak.http.HttpRequest; +import org.keycloak.http.HttpResponse; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; @@ -36,18 +49,7 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.resource.AccountResourceProvider; import org.keycloak.theme.Theme; -import jakarta.ws.rs.HttpMethod; -import jakarta.ws.rs.InternalServerErrorException; -import jakarta.ws.rs.NotAuthorizedException; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.UriInfo; -import java.io.IOException; -import java.util.List; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java b/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java index 998b5729058..3a76203ea57 100755 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java @@ -45,16 +45,15 @@ import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.common.Profile.Feature; -import org.keycloak.http.HttpRequest; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; +import org.keycloak.common.Profile.Feature; import org.keycloak.common.enums.AccountRestApiVersion; import org.keycloak.common.util.StringPropertyReplacer; import org.keycloak.events.Details; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; +import org.keycloak.http.HttpRequest; import org.keycloak.models.AccountRoles; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; @@ -80,13 +79,15 @@ import org.keycloak.storage.ReadOnlyException; import org.keycloak.theme.Theme; import org.keycloak.userprofile.AttributeMetadata; import org.keycloak.userprofile.Attributes; +import org.keycloak.userprofile.EventAuditingAttributeChangeListener; import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileContext; import org.keycloak.userprofile.UserProfileProvider; -import org.keycloak.userprofile.EventAuditingAttributeChangeListener; import org.keycloak.userprofile.ValidationException; import org.keycloak.userprofile.ValidationException.Error; +import org.jboss.resteasy.reactive.NoCache; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/resources/account/Constants.java b/services/src/main/java/org/keycloak/services/resources/account/Constants.java index 60389c35566..635c8dddbff 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/Constants.java +++ b/services/src/main/java/org/keycloak/services/resources/account/Constants.java @@ -16,12 +16,12 @@ */ package org.keycloak.services.resources.account; -import org.keycloak.events.Details; -import org.keycloak.events.EventType; - import java.util.HashSet; import java.util.Set; +import org.keycloak.events.Details; +import org.keycloak.events.EventType; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/resources/account/CorsPreflightService.java b/services/src/main/java/org/keycloak/services/resources/account/CorsPreflightService.java index a1da7b3d453..dd57e638a41 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/CorsPreflightService.java +++ b/services/src/main/java/org/keycloak/services/resources/account/CorsPreflightService.java @@ -1,11 +1,11 @@ package org.keycloak.services.resources.account; -import org.keycloak.services.cors.Cors; - import jakarta.ws.rs.OPTIONS; import jakarta.ws.rs.Path; import jakarta.ws.rs.core.Response; +import org.keycloak.services.cors.Cors; + /** * Created by st on 21/03/17. */ diff --git a/services/src/main/java/org/keycloak/services/resources/account/LinkedAccountsResource.java b/services/src/main/java/org/keycloak/services/resources/account/LinkedAccountsResource.java index c4d5250f634..f33bb31ce57 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/LinkedAccountsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/account/LinkedAccountsResource.java @@ -34,18 +34,18 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; -import org.keycloak.models.IdentityProviderQuery; + +import org.keycloak.broker.social.SocialIdentityProvider; import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; -import org.keycloak.http.HttpRequest; -import org.keycloak.broker.social.SocialIdentityProvider; import org.keycloak.events.Details; import org.keycloak.events.EventBuilder; import org.keycloak.events.EventType; +import org.keycloak.http.HttpRequest; import org.keycloak.models.AccountRoles; import org.keycloak.models.FederatedIdentityModel; import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderQuery; import org.keycloak.models.IdentityProviderShowInAccountConsole; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -65,6 +65,8 @@ import org.keycloak.theme.Theme; import org.keycloak.utils.BrokerUtil; import org.keycloak.utils.StreamsUtil; +import org.jboss.logging.Logger; + import static org.keycloak.models.Constants.ACCOUNT_CONSOLE_CLIENT_ID; /** diff --git a/services/src/main/java/org/keycloak/services/resources/account/OrganizationsResource.java b/services/src/main/java/org/keycloak/services/resources/account/OrganizationsResource.java index 917ca3fd1f3..f9415c3d189 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/OrganizationsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/account/OrganizationsResource.java @@ -23,6 +23,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.models.AccountRoles; import org.keycloak.models.KeycloakSession; import org.keycloak.models.OrganizationDomainModel; diff --git a/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java b/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java index f520302de42..36b1c6663ee 100755 --- a/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java +++ b/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java @@ -16,6 +16,13 @@ */ package org.keycloak.services.resources.account; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import jakarta.ws.rs.DELETE; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; @@ -24,14 +31,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import org.jboss.resteasy.reactive.NoCache; import org.keycloak.device.DeviceActivityManager; import org.keycloak.models.AccountRoles; import org.keycloak.models.ClientModel; @@ -45,6 +45,8 @@ import org.keycloak.representations.account.SessionRepresentation; import org.keycloak.services.managers.Auth; import org.keycloak.services.managers.AuthenticationManager; +import org.jboss.resteasy.reactive.NoCache; + /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/services/resources/account/resources/AbstractResourceService.java b/services/src/main/java/org/keycloak/services/resources/account/resources/AbstractResourceService.java index 84f1eb78903..72989ffdb66 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/resources/AbstractResourceService.java +++ b/services/src/main/java/org/keycloak/services/resources/account/resources/AbstractResourceService.java @@ -25,13 +25,13 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.keycloak.http.HttpRequest; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.authorization.store.PermissionTicketStore; import org.keycloak.authorization.store.ResourceStore; import org.keycloak.authorization.store.ScopeStore; +import org.keycloak.http.HttpRequest; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakUriInfo; diff --git a/services/src/main/java/org/keycloak/services/resources/account/resources/ResourceService.java b/services/src/main/java/org/keycloak/services/resources/account/resources/ResourceService.java index dee48654e70..62cb47365ee 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/resources/ResourceService.java +++ b/services/src/main/java/org/keycloak/services/resources/account/resources/ResourceService.java @@ -16,15 +16,6 @@ */ package org.keycloak.services.resources.account.resources; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Response; import java.util.Calendar; import java.util.Collection; import java.util.Collections; @@ -34,9 +25,19 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.keycloak.http.HttpRequest; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; + import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.model.ResourceServer; +import org.keycloak.http.HttpRequest; import org.keycloak.models.AccountRoles; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; diff --git a/services/src/main/java/org/keycloak/services/resources/account/resources/ResourcesService.java b/services/src/main/java/org/keycloak/services/resources/account/resources/ResourcesService.java index 2824f7fa1dd..9cea7c3e5e4 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/resources/ResourcesService.java +++ b/services/src/main/java/org/keycloak/services/resources/account/resources/ResourcesService.java @@ -16,15 +16,6 @@ */ package org.keycloak.services.resources.account.resources; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Link; -import jakarta.ws.rs.core.Response; import java.util.ArrayList; import java.util.Collection; import java.util.EnumMap; @@ -34,10 +25,20 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.keycloak.http.HttpRequest; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.Response; + import org.keycloak.authorization.model.PermissionTicket; import org.keycloak.authorization.store.PermissionTicketStore; import org.keycloak.common.util.KeycloakUriBuilder; +import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; import org.keycloak.services.managers.Auth; 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 41b47f86b69..dee8e0cd00c 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java @@ -16,7 +16,15 @@ */ package org.keycloak.services.resources.admin; -import com.fasterxml.jackson.annotation.JsonProperty; +import java.io.IOException; +import java.net.URI; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.GET; import jakarta.ws.rs.NotAuthorizedException; @@ -26,14 +34,12 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; + import org.keycloak.Config; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; import org.keycloak.common.Version; import org.keycloak.common.util.Environment; -import org.keycloak.utils.SecureContextResolver; import org.keycloak.common.util.UriUtils; import org.keycloak.headers.SecurityHeadersProvider; import org.keycloak.http.HttpRequest; @@ -57,15 +63,11 @@ import org.keycloak.theme.FreeMarkerException; import org.keycloak.theme.freemarker.FreeMarkerProvider; import org.keycloak.urls.UrlType; import org.keycloak.utils.MediaType; +import org.keycloak.utils.SecureContextResolver; -import java.io.IOException; -import java.net.URI; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.stream.Collectors; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import static org.keycloak.models.UserModel.IS_TEMP_ADMIN_ATTR_NAME; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminCorsPreflightService.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminCorsPreflightService.java index de223994bc1..47c102832bc 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminCorsPreflightService.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminCorsPreflightService.java @@ -1,11 +1,11 @@ package org.keycloak.services.resources.admin; -import org.keycloak.services.cors.Cors; - import jakarta.ws.rs.OPTIONS; import jakarta.ws.rs.Path; import jakarta.ws.rs.core.Response; +import org.keycloak.services.cors.Cors; + /** * Created by st on 21/03/17. */ 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 04cc4425804..8089f1b33a8 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 @@ -16,9 +16,14 @@ */ package org.keycloak.services.resources.admin; -import static org.keycloak.models.utils.StripSecretsUtils.stripSecrets; +import java.io.IOException; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.UUID; + +import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; import org.keycloak.common.ClientConnection; import org.keycloak.common.util.Time; import org.keycloak.events.EventListenerProvider; @@ -34,15 +39,11 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.services.ServicesLogger; import org.keycloak.util.JsonSerialization; - -import jakarta.ws.rs.core.UriInfo; import org.keycloak.utils.StringUtil; -import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.UUID; +import org.jboss.logging.Logger; + +import static org.keycloak.models.utils.StripSecretsUtils.stripSecrets; public class AdminEventBuilder { 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 71d24a143e8..e82a8833970 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 @@ -16,13 +16,28 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; -import jakarta.ws.rs.NotFoundException; +import java.io.IOException; +import java.util.Locale; +import java.util.Properties; + +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; import jakarta.ws.rs.NotAuthorizedException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.Provider; + import org.keycloak.common.Profile; import org.keycloak.common.util.Encode; +import org.keycloak.http.HttpRequest; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; import org.keycloak.models.KeycloakSession; @@ -35,27 +50,13 @@ import org.keycloak.services.managers.AppAuthManager; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.services.resources.WelcomeResource; -import org.keycloak.services.resources.admin.info.ServerInfoAdminResource; import org.keycloak.services.resources.admin.fgap.AdminPermissions; +import org.keycloak.services.resources.admin.info.ServerInfoAdminResource; import org.keycloak.theme.Theme; import org.keycloak.urls.UrlType; -import jakarta.ws.rs.ForbiddenException; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.HttpMethod; -import jakarta.ws.rs.OPTIONS; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.core.Context; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriInfo; -import jakarta.ws.rs.ext.Provider; - -import java.io.IOException; -import java.util.Locale; -import java.util.Properties; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.jboss.logging.Logger; /** * Root resource for admin console and admin REST API 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 59d494e4fbe..86583f58360 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 @@ -16,11 +16,17 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.util.HashMap; +import java.util.Map; + +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; + import org.keycloak.common.ClientConnection; import org.keycloak.common.util.Time; import org.keycloak.events.admin.OperationType; @@ -33,15 +39,11 @@ import org.keycloak.services.managers.BruteForceProtector; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import java.util.HashMap; -import java.util.Map; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; /** * Base resource class for the admin REST api of one realm diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java b/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java index a72a8449fc5..d30696f8cf4 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java @@ -16,16 +16,32 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.authentication.AuthenticationFlow; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.ClientAuthenticator; @@ -42,8 +58,8 @@ import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.AuthenticatorConfigModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RequiredActionConfigModel; import org.keycloak.models.RealmModel; +import org.keycloak.models.RequiredActionConfigModel; import org.keycloak.models.RequiredActionProviderModel; import org.keycloak.models.utils.Base32; import org.keycloak.models.utils.DefaultAuthenticationFlows; @@ -68,33 +84,18 @@ import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.userprofile.ValidationException; import org.keycloak.utils.CredentialHelper; - -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import org.keycloak.utils.RequiredActionHelper; import org.keycloak.utils.ReservedCharValidator; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; + /** * @resource Authentication Management * @author Bill Burke 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 149a0263bcf..cb308ddc77c 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 @@ -17,20 +17,34 @@ package org.keycloak.services.resources.admin; -import com.google.common.base.Strings; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.security.KeyStore; +import java.security.PrivateKey; +import java.security.UnrecoverableKeyException; +import java.security.cert.Certificate; +import java.security.cert.X509Certificate; +import java.util.Calendar; +import java.util.Set; +import java.util.stream.Collectors; + +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; import jakarta.ws.rs.NotAcceptableException; import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.KeystoreUtil.KeystoreFormat; import org.keycloak.common.util.PemUtils; import org.keycloak.common.util.StreamUtil; -import org.keycloak.common.util.KeystoreUtil.KeystoreFormat; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.http.FormPartValue; @@ -47,26 +61,13 @@ import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.util.CertificateInfoHelper; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.security.KeyStore; -import java.security.PrivateKey; -import java.security.UnrecoverableKeyException; -import java.security.cert.Certificate; -import java.security.cert.X509Certificate; -import java.util.Calendar; -import java.util.Set; -import java.util.stream.Collectors; +import com.google.common.base.Strings; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; /** * @resource Client Attribute Certificate diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java index 5f26d5383e3..4d815107199 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientInitialAccessResource.java @@ -17,24 +17,7 @@ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.keycloak.http.HttpResponse; -import org.keycloak.events.admin.OperationType; -import org.keycloak.events.admin.ResourceType; -import org.keycloak.models.ClientInitialAccessModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation; -import org.keycloak.representations.idm.ClientInitialAccessPresentation; -import org.keycloak.representations.idm.OAuth2ErrorRepresentation; -import org.keycloak.services.clientregistration.ClientRegistrationTokenUtils; -import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import java.util.stream.Stream; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -47,7 +30,25 @@ import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.stream.Stream; +import org.keycloak.events.admin.OperationType; +import org.keycloak.events.admin.ResourceType; +import org.keycloak.http.HttpResponse; +import org.keycloak.models.ClientInitialAccessModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation; +import org.keycloak.representations.idm.ClientInitialAccessPresentation; +import org.keycloak.representations.idm.OAuth2ErrorRepresentation; +import org.keycloak.services.clientregistration.ClientRegistrationTokenUtils; +import org.keycloak.services.resources.KeycloakOpenAPI; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; + +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; /** * @resource Client Initial Access diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java index 265ca5ba076..ad92e2f75e8 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java @@ -17,7 +17,6 @@ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.PUT; @@ -26,10 +25,6 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; import org.keycloak.models.KeycloakSession; @@ -40,6 +35,12 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; + @Extension(name = KeycloakOpenAPI.Profiles.ADMIN, value = "") public class ClientPoliciesResource { protected static final Logger logger = Logger.getLogger(ClientPoliciesResource.class); diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java index 0f8eccd07f5..27da4b94901 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java @@ -17,7 +17,6 @@ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.PUT; @@ -26,10 +25,6 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; import org.keycloak.models.KeycloakSession; @@ -40,6 +35,12 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; + @Extension(name = KeycloakOpenAPI.Profiles.ADMIN, value = "") public class ClientProfilesResource { protected static final Logger logger = Logger.getLogger(ClientProfilesResource.class); diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java index 6a097a4bc99..ddbcb18aca8 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java @@ -17,10 +17,14 @@ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; +import java.util.List; +import java.util.stream.Stream; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; + import org.keycloak.events.admin.ResourceType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -33,12 +37,10 @@ import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyF import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import java.util.List; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; /** * @resource Client Registration Policy 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 571af77b0c3..d6cd0c82bbd 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 @@ -16,17 +16,29 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Stream; + +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.OAuthErrorException; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.admin.AuthorizationService; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.client.clienttype.ClientTypeException; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; @@ -79,24 +91,14 @@ import org.keycloak.utils.ProfileHelper; import org.keycloak.utils.ReservedCharValidator; import org.keycloak.validation.ValidationUtil; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; /** diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java index 0c09a67102c..ea2c993acd8 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java @@ -16,17 +16,25 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.util.List; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; import jakarta.ws.rs.NotFoundException; -import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.ClientModel; @@ -40,24 +48,17 @@ import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.ErrorResponseException; +import org.keycloak.services.resources.KeycloakOpenAPI; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.storage.ReadOnlyException; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; -import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; /** * @resource Client Role Mappings diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java index 52768129ba3..75584e1762e 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java @@ -17,8 +17,6 @@ package org.keycloak.services.resources.admin; -import static org.keycloak.protocol.ProtocolMapperUtils.isEnabled; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -27,14 +25,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; import jakarta.ws.rs.GET; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.Path; @@ -44,10 +34,6 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.UriInfo; -import com.fasterxml.jackson.annotation.JsonProperty; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; import org.keycloak.authentication.actiontoken.TokenUtils; import org.keycloak.common.ClientConnection; import org.keycloak.common.util.CollectionUtil; @@ -75,6 +61,21 @@ import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; +import com.fasterxml.jackson.annotation.JsonProperty; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; + +import static org.keycloak.protocol.ProtocolMapperUtils.isEnabled; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java index 4a53366ac0c..5db43839954 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java @@ -22,20 +22,11 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.eclipse.microprofile.openapi.annotations.Operation; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; @@ -47,6 +38,16 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java index 2312eda04cc..95ef19ac7fb 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java @@ -16,15 +16,21 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.util.Arrays; +import java.util.Optional; +import java.util.Set; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.common.Profile; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -47,20 +53,15 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; - -import java.util.Arrays; -import java.util.Optional; -import java.util.Set; -import java.util.regex.Pattern; -import java.util.stream.Collectors; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; /** diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java index 8f184ab006d..2d0a74cb05c 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java @@ -16,16 +16,19 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.util.Optional; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.ClientScopeModel; @@ -41,18 +44,16 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; - -import java.util.Optional; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; /** * Base resource class for managing a realm's client scopes. diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientTypesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientTypesResource.java index 474fb9c8127..76a07fc2b6b 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientTypesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientTypesResource.java @@ -26,19 +26,20 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; +import org.keycloak.client.clienttype.ClientTypeException; +import org.keycloak.client.clienttype.ClientTypeManager; +import org.keycloak.models.RealmModel; +import org.keycloak.representations.idm.ClientTypesRepresentation; +import org.keycloak.services.ErrorResponse; +import org.keycloak.services.resources.KeycloakOpenAPI; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; + import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.models.RealmModel; -import org.keycloak.representations.idm.ClientTypesRepresentation; -import org.keycloak.services.ErrorResponse; -import org.keycloak.client.clienttype.ClientTypeException; -import org.keycloak.client.clienttype.ClientTypeManager; -import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; /** * @author Marek Posolda diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java index 9108ab20770..8e99a9a8773 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java @@ -16,16 +16,24 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; +import java.util.Map; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.authorization.admin.AuthorizationService; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.client.clienttype.ClientTypeException; import org.keycloak.common.Profile; import org.keycloak.events.Errors; @@ -52,22 +60,17 @@ import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.utils.SearchQueryUtils; import org.keycloak.validation.ValidationUtil; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.ForbiddenException; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.util.Map; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import static java.lang.Boolean.TRUE; + import static org.keycloak.utils.StreamsUtil.paginatedStream; /** diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java index edb3eb51c76..d9d50326b22 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java @@ -16,12 +16,29 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.text.MessageFormat; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Properties; +import java.util.stream.Stream; + +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.common.ClientConnection; import org.keycloak.component.ComponentFactory; import org.keycloak.component.ComponentModel; @@ -43,26 +60,11 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.text.MessageFormat; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Properties; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; /** * @resource Component diff --git a/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java b/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java index 4eaa006b6fa..7cf5f4702a5 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java @@ -16,13 +16,27 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; +import java.net.URI; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.common.Profile; import org.keycloak.common.util.ObjectUtil; @@ -47,25 +61,13 @@ import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.utils.GroupUtils; import org.keycloak.utils.ProfileHelper; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; import static org.keycloak.utils.StreamsUtil.paginatedStream; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java index a10b2b8499e..f4e2ebcbb36 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java @@ -16,6 +16,12 @@ */ package org.keycloak.services.resources.admin; +import java.net.URI; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Stream; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; @@ -27,20 +33,8 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Stream; - import jakarta.ws.rs.core.Response.Status; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.common.util.ObjectUtil; import org.keycloak.events.admin.OperationType; @@ -58,6 +52,14 @@ import org.keycloak.services.resources.admin.fgap.GroupPermissionEvaluator; import org.keycloak.utils.GroupUtils; import org.keycloak.utils.SearchQueryUtils; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; + /** * @resource Groups * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java index ce81fd4caf3..4e6f330a58c 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java @@ -16,16 +16,26 @@ */ package org.keycloak.services.resources.admin; -import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import java.util.Collections; +import java.util.Map; +import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; import org.keycloak.broker.provider.IdentityProvider; import org.keycloak.broker.provider.IdentityProviderFactory; import org.keycloak.broker.provider.IdentityProviderMapper; @@ -57,25 +67,16 @@ import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.utils.ProfileHelper; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; -import java.util.Collections; -import java.util.Map; -import java.util.Objects; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; /** * @resource Identity Providers diff --git a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java index 343abcf828a..14457ec42b5 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java @@ -17,37 +17,12 @@ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.models.IdentityProviderCapability; -import org.keycloak.models.IdentityProviderQuery; -import org.keycloak.models.IdentityProviderType; -import org.keycloak.broker.provider.IdentityProvider; -import org.keycloak.broker.provider.IdentityProviderFactory; -import org.keycloak.broker.social.SocialIdentityProvider; -import org.keycloak.common.util.StreamUtil; -import org.keycloak.connections.httpclient.HttpClientProvider; -import org.keycloak.events.admin.OperationType; -import org.keycloak.events.admin.ResourceType; -import org.keycloak.http.FormPartValue; -import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelDuplicateException; -import org.keycloak.models.RealmModel; -import org.keycloak.models.utils.ModelToRepresentation; -import org.keycloak.models.utils.RepresentationToModel; -import org.keycloak.models.utils.StripSecretsUtils; -import org.keycloak.provider.ProviderFactory; -import org.keycloak.representations.idm.IdentityProviderRepresentation; -import org.keycloak.services.ErrorResponse; -import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import org.keycloak.utils.ReservedCharValidator; +import java.io.IOException; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.function.Function; +import java.util.stream.Stream; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.Consumes; @@ -60,14 +35,40 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; + +import org.keycloak.broker.provider.IdentityProvider; +import org.keycloak.broker.provider.IdentityProviderFactory; +import org.keycloak.broker.social.SocialIdentityProvider; +import org.keycloak.common.util.StreamUtil; +import org.keycloak.connections.httpclient.HttpClientProvider; +import org.keycloak.events.admin.OperationType; +import org.keycloak.events.admin.ResourceType; +import org.keycloak.http.FormPartValue; +import org.keycloak.models.IdentityProviderCapability; +import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderQuery; +import org.keycloak.models.IdentityProviderType; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.ModelDuplicateException; +import org.keycloak.models.RealmModel; +import org.keycloak.models.utils.ModelToRepresentation; +import org.keycloak.models.utils.RepresentationToModel; +import org.keycloak.models.utils.StripSecretsUtils; +import org.keycloak.provider.ProviderFactory; +import org.keycloak.representations.idm.IdentityProviderRepresentation; +import org.keycloak.services.ErrorResponse; +import org.keycloak.services.resources.KeycloakOpenAPI; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.utils.ReservedCharValidator; import org.keycloak.utils.StringUtil; -import java.io.IOException; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.function.Function; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java b/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java index f5a83465541..e0dc0f91310 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java @@ -17,10 +17,17 @@ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.Base64; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; + import org.keycloak.common.util.PemUtils; import org.keycloak.crypto.KeyWrapper; import org.keycloak.models.KeycloakSession; @@ -29,16 +36,10 @@ import org.keycloak.representations.idm.KeysMetadataRepresentation; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; - -import java.security.cert.CertificateEncodingException; -import java.security.cert.X509Certificate; -import java.util.Base64; -import java.util.HashMap; -import java.util.List; -import java.util.stream.Collectors; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; /** * @resource Key diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java index c7347e5110c..3541f72fcec 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java @@ -16,17 +16,24 @@ */ package org.keycloak.services.resources.admin; -import static org.keycloak.protocol.ProtocolMapperUtils.isEnabled; +import java.text.MessageFormat; +import java.util.List; +import java.util.Objects; +import java.util.Properties; +import java.util.stream.Stream; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.KeycloakSession; @@ -44,21 +51,16 @@ import org.keycloak.services.ErrorResponseException; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.text.MessageFormat; -import java.util.List; -import java.util.Objects; -import java.util.Properties; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; + +import static org.keycloak.protocol.ProtocolMapperUtils.isEnabled; /** * Base resource for managing users 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 1174bf2e0ae..e1d7964a65f 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java @@ -16,7 +16,17 @@ */ package org.keycloak.services.resources.admin; -import com.fasterxml.jackson.core.type.TypeReference; +import java.io.InputStream; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -35,17 +45,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.StreamingOutput; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; + import org.keycloak.Config; import org.keycloak.KeyPairVerifier; import org.keycloak.authentication.CredentialRegistrator; @@ -86,7 +86,6 @@ import org.keycloak.models.utils.RepresentationToModel; import org.keycloak.organization.admin.resource.OrganizationsResource; import org.keycloak.partialimport.PartialImportResult; import org.keycloak.partialimport.PartialImportResults; -import org.keycloak.workflow.admin.resource.WorkflowsResource; import org.keycloak.representations.adapters.action.GlobalRequestResult; import org.keycloak.representations.idm.AdminEventRepresentation; import org.keycloak.representations.idm.ClientRepresentation; @@ -114,17 +113,20 @@ import org.keycloak.utils.GroupUtils; import org.keycloak.utils.ProfileHelper; import org.keycloak.utils.ReservedCharValidator; import org.keycloak.utils.SMTPUtil; +import org.keycloak.workflow.admin.resource.WorkflowsResource; -import java.io.InputStream; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import com.fasterxml.jackson.core.type.TypeReference; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import static org.keycloak.util.JsonSerialization.readValue; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java index 26b1c3b49d6..cc5a3ed1ae1 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmLocalizationResource.java @@ -17,27 +17,10 @@ package org.keycloak.services.resources.admin; -import com.fasterxml.jackson.core.type.TypeReference; - -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.keycloak.http.FormPartValue; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.ModelDuplicateException; -import org.keycloak.models.RealmModel; -import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; - import java.io.IOException; import java.io.InputStream; -import java.util.Map; import java.util.HashMap; +import java.util.Map; import java.util.stream.Stream; import jakarta.ws.rs.BadRequestException; @@ -54,10 +37,27 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; + +import org.keycloak.http.FormPartValue; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.ModelDuplicateException; +import org.keycloak.models.RealmModel; +import org.keycloak.services.resources.KeycloakOpenAPI; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.StringUtil; +import com.fasterxml.jackson.core.type.TypeReference; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; + @Extension(name = KeycloakOpenAPI.Profiles.ADMIN, value = "") public class RealmLocalizationResource { private final RealmModel realm; 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 60bd09166ad..0fd18769a9c 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 @@ -16,17 +16,26 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.io.InputStream; +import java.net.URI; +import java.util.Arrays; +import java.util.Objects; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.common.ClientConnection; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -49,24 +58,17 @@ import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.storage.DatastoreProvider; import org.keycloak.storage.ExportImportManager; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.ForbiddenException; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.CacheControl; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.io.InputStream; -import java.net.URI; -import java.util.Arrays; -import java.util.Objects; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import static org.keycloak.utils.StreamsUtil.throwIfEmpty; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResourcePreflight.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResourcePreflight.java index 646a05c6fc4..39311108415 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResourcePreflight.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResourcePreflight.java @@ -20,6 +20,7 @@ package org.keycloak.services.resources.admin; import jakarta.ws.rs.OPTIONS; import jakarta.ws.rs.Path; import jakarta.ws.rs.core.Response; + import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.TokenManager; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java index 5df25ffad29..e2ac99448f2 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java @@ -16,17 +16,22 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.util.List; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.common.Profile; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -44,20 +49,17 @@ import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.utils.ProfileHelper; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; /** * Sometimes its easier to just interact with roles by their ID instead of container/role-name diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java index cc19aaea78a..c2c449d7091 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java @@ -17,16 +17,30 @@ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Stream; + +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.common.Profile; import org.keycloak.common.util.Encode; import org.keycloak.events.admin.OperationType; @@ -51,28 +65,16 @@ import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.utils.ProfileHelper; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; /** * @resource Roles diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java index e115e414240..5340e072b95 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java @@ -16,19 +16,30 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.common.ClientConnection; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -50,27 +61,17 @@ import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.storage.ReadOnlyException; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; /** * Base resource for managing users diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java index e6c5fea35d3..934ba16320d 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleResource.java @@ -17,6 +17,16 @@ package org.keycloak.services.resources.admin; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Stream; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.ClientModel; @@ -27,15 +37,6 @@ import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.UriInfo; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Stream; - /** * @resource Roles * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java index 896282c41d4..1f330c289d8 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java @@ -17,13 +17,23 @@ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; +import java.util.List; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.ClientModel; @@ -37,20 +47,12 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import java.util.List; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; /** * @resource Scope Mappings diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java index 2bdf06bfa39..21a04915689 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java @@ -17,13 +17,26 @@ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.GET; import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.ClientModel; @@ -39,23 +52,12 @@ import org.keycloak.services.resources.KeycloakOpenAPI; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; import org.keycloak.services.util.ScopeMappedUtil; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MediaType; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; /** * Base class for managing the scope mappings of a specific client. diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java index 80ef5a6db6d..0e5eb4bf170 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UserProfileResource.java @@ -16,8 +16,6 @@ */ package org.keycloak.services.resources.admin; -import static org.keycloak.userprofile.UserProfileUtil.createUserProfileMetadata; - import java.util.Collections; import jakarta.ws.rs.Consumes; @@ -28,6 +26,20 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; +import org.keycloak.component.ComponentValidationException; +import org.keycloak.events.admin.OperationType; +import org.keycloak.events.admin.ResourceType; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.representations.idm.UserProfileMetadata; +import org.keycloak.representations.userprofile.config.UPConfig; +import org.keycloak.services.ErrorResponse; +import org.keycloak.services.resources.KeycloakOpenAPI; +import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import org.keycloak.userprofile.UserProfile; +import org.keycloak.userprofile.UserProfileContext; +import org.keycloak.userprofile.UserProfileProvider; + import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.media.Content; @@ -36,19 +48,7 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.keycloak.component.ComponentValidationException; -import org.keycloak.events.admin.OperationType; -import org.keycloak.events.admin.ResourceType; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.representations.idm.UserProfileMetadata; -import org.keycloak.services.ErrorResponse; -import org.keycloak.services.resources.KeycloakOpenAPI; -import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; -import org.keycloak.userprofile.UserProfile; -import org.keycloak.userprofile.UserProfileContext; -import org.keycloak.userprofile.UserProfileProvider; -import org.keycloak.representations.userprofile.config.UPConfig; +import static org.keycloak.userprofile.UserProfileUtil.createUserProfileMetadata; /** * @author Vlastimil Elias diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java index 4637eb01ea6..d750c95c660 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java @@ -16,17 +16,42 @@ */ package org.keycloak.services.resources.admin; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.net.URI; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Objects; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.authentication.actiontoken.execactions.ExecuteActionsActionToken; @@ -95,46 +120,23 @@ import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileProvider; import org.keycloak.userprofile.ValidationException; import org.keycloak.utils.ProfileHelper; - -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DELETE; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.ForbiddenException; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.PUT; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; -import jakarta.ws.rs.core.UriBuilder; import org.keycloak.utils.StringUtil; -import java.net.URI; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Objects; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import static java.util.Collections.emptyList; import static java.util.Optional.ofNullable; + import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_ID; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_USERNAME; import static org.keycloak.userprofile.UserProfileContext.USER_API; 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 738238c8440..d53f139928c 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 @@ -16,18 +16,32 @@ */ package org.keycloak.services.resources.admin; +import java.text.MessageFormat; import java.util.Arrays; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.media.Content; -import org.eclipse.microprofile.openapi.annotations.media.Schema; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.logging.Logger; -import org.jboss.resteasy.reactive.NoCache; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.ForbiddenException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; @@ -58,30 +72,17 @@ import org.keycloak.userprofile.UserProfileContext; import org.keycloak.userprofile.UserProfileProvider; import org.keycloak.utils.SearchQueryUtils; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.ForbiddenException; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; - -import java.text.MessageFormat; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Properties; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.media.Content; +import org.eclipse.microprofile.openapi.annotations.media.Schema; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; +import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.NoCache; import static org.keycloak.models.utils.KeycloakModelUtils.findGroupByPath; import static org.keycloak.userprofile.UserProfileContext.USER_API; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionEvaluator.java index 017c148e013..6849ea43a7d 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionEvaluator.java @@ -16,14 +16,14 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Map; +import java.util.Set; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.models.AdminRoles; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; -import java.util.Map; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionManagement.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionManagement.java index 337c8a990dd..5150624c1f4 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionManagement.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionManagement.java @@ -16,14 +16,14 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Map; + import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.models.ClientModel; import org.keycloak.representations.AccessToken; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissions.java index 47043edb551..874babe8cd1 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissions.java @@ -16,11 +16,21 @@ */ package org.keycloak.services.resources.admin.fgap; -import org.jboss.logging.Logger; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; + +import jakarta.ws.rs.ForbiddenException; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.common.ClientModelIdentity; import org.keycloak.authorization.common.DefaultEvaluationContext; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.ResourceServer; @@ -38,16 +48,7 @@ import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.authorization.Permission; import org.keycloak.storage.StorageId; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; - -import jakarta.ws.rs.ForbiddenException; +import org.jboss.logging.Logger; import static org.keycloak.authorization.fgap.AdminPermissionsSchema.CLIENTS_RESOURCE_TYPE; import static org.keycloak.services.resources.admin.fgap.AdminPermissionManagement.TOKEN_EXCHANGE; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionsV2.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionsV2.java index 8e57521908d..ad3ae75a0df 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionsV2.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/ClientPermissionsV2.java @@ -16,10 +16,11 @@ */ package org.keycloak.services.resources.admin.fgap; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.CLIENTS_RESOURCE_TYPE; +import java.util.Map; +import java.util.Set; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.models.AdminRoles; @@ -30,8 +31,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.representations.AccessToken; import org.keycloak.services.resources.admin.fgap.ModelRecord.ClientModelRecord; -import java.util.Map; -import java.util.Set; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.CLIENTS_RESOURCE_TYPE; class ClientPermissionsV2 extends ClientPermissions { diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/FineGrainedAdminPermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/FineGrainedAdminPermissionEvaluator.java index 02186ebc1c1..f5d09672f6f 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/FineGrainedAdminPermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/FineGrainedAdminPermissionEvaluator.java @@ -23,6 +23,7 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionEvaluator.java index 433c17546da..6f8c125a52b 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionEvaluator.java @@ -16,13 +16,13 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Map; +import java.util.Set; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.models.AdminRoles; import org.keycloak.models.GroupModel; -import java.util.Map; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionManagement.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionManagement.java index a77efd33992..2a3dc5c67ee 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionManagement.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionManagement.java @@ -16,12 +16,12 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Map; + import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.models.GroupModel; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissions.java index 2f4e0822244..0bf08daa816 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissions.java @@ -16,6 +16,18 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import jakarta.ws.rs.ForbiddenException; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; @@ -29,18 +41,6 @@ import org.keycloak.models.AdminRoles; import org.keycloak.models.GroupModel; import org.keycloak.representations.idm.authorization.Permission; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import jakarta.ws.rs.ForbiddenException; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionsV2.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionsV2.java index 1b88aa9a556..e9467c85919 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionsV2.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/GroupPermissionsV2.java @@ -19,8 +19,8 @@ package org.keycloak.services.resources.admin.fgap; import java.util.Map; import java.util.Set; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.models.AdminRoles; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/Helper.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/Helper.java index 9bf12fdf0a8..d01dfbbc4d0 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/Helper.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/Helper.java @@ -16,6 +16,9 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; @@ -28,9 +31,6 @@ import org.keycloak.representations.idm.authorization.Logic; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; -import java.util.HashMap; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissionManagement.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissionManagement.java index 9afb2dba371..f7a883214e1 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissionManagement.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissionManagement.java @@ -16,13 +16,13 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Map; + import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.models.ClientModel; import org.keycloak.models.IdentityProviderModel; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissions.java index ae2e25b2168..c2395171848 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/IdentityProviderPermissions.java @@ -16,7 +16,13 @@ */ package org.keycloak.services.resources.admin.fgap; -import org.jboss.logging.Logger; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.common.ClientModelIdentity; import org.keycloak.authorization.common.DefaultEvaluationContext; @@ -30,12 +36,7 @@ import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; +import org.jboss.logging.Logger; import static org.keycloak.services.resources.admin.fgap.AdminPermissionManagement.TOKEN_EXCHANGE; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/MgmtPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/MgmtPermissions.java index f807e0289d2..5e654dc6c28 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/MgmtPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/MgmtPermissions.java @@ -16,6 +16,12 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import jakarta.ws.rs.ForbiddenException; + import org.keycloak.Config; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.AuthorizationProviderFactory; @@ -43,12 +49,6 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.managers.RealmManager; import org.keycloak.services.resources.admin.AdminAuth; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -import jakarta.ws.rs.ForbiddenException; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmAuth.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmAuth.java index 4e84afb2500..18522c0277e 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmAuth.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmAuth.java @@ -17,12 +17,12 @@ package org.keycloak.services.resources.admin.fgap; +import jakarta.ws.rs.ForbiddenException; + import org.keycloak.models.AdminRoles; import org.keycloak.models.ClientModel; import org.keycloak.services.resources.admin.AdminAuth; -import jakarta.ws.rs.ForbiddenException; - /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissions.java index 77413f6cf37..33fcd200699 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RealmPermissions.java @@ -16,9 +16,10 @@ */ package org.keycloak.services.resources.admin.fgap; +import jakarta.ws.rs.ForbiddenException; + import org.keycloak.authorization.model.ResourceServer; import org.keycloak.models.AdminRoles; -import jakarta.ws.rs.ForbiddenException; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionEvaluator.java index b110dec6bc8..05af1fcde28 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionEvaluator.java @@ -16,12 +16,12 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Set; + import org.keycloak.models.ClientModel; import org.keycloak.models.RoleContainerModel; import org.keycloak.models.RoleModel; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionManagement.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionManagement.java index 482ef20a924..66d3b17b7e4 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionManagement.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionManagement.java @@ -16,13 +16,13 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Map; + import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.models.RoleModel; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissions.java index 003be46cd16..3d5dc229967 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissions.java @@ -16,7 +16,15 @@ */ package org.keycloak.services.resources.admin.fgap; -import org.jboss.logging.Logger; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; + +import jakarta.ws.rs.ForbiddenException; + import org.keycloak.Config; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; @@ -35,14 +43,7 @@ import org.keycloak.models.RoleModel; import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.Permission; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; - -import jakarta.ws.rs.ForbiddenException; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionsV2.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionsV2.java index 726ce74ecba..6b94be6c62d 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionsV2.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/RolePermissionsV2.java @@ -17,13 +17,12 @@ package org.keycloak.services.resources.admin.fgap; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.ROLES_RESOURCE_TYPE; - import java.util.Map; import java.util.Set; + import org.keycloak.Config; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.AuthorizationProvider; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.authorization.model.ResourceServer; @@ -37,6 +36,8 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.services.resources.admin.fgap.ModelRecord.RoleModelRecord; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.ROLES_RESOURCE_TYPE; + class RolePermissionsV2 extends RolePermissions { private final FineGrainedAdminPermissionEvaluator eval; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionEvaluator.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionEvaluator.java index 0b3a354867a..bb590e4ed7d 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionEvaluator.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionEvaluator.java @@ -16,14 +16,14 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Map; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.models.AdminRoles; import org.keycloak.models.ClientModel; import org.keycloak.models.ImpersonationConstants; import org.keycloak.models.UserModel; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionManagement.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionManagement.java index 49454801d3f..3b28ecb2144 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionManagement.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionManagement.java @@ -16,13 +16,13 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Map; + import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; import org.keycloak.models.ClientModel; import org.keycloak.models.UserModel; -import java.util.Map; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissions.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissions.java index e5a7f8ba986..c6dbfbfd3d3 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissions.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissions.java @@ -16,6 +16,19 @@ */ package org.keycloak.services.resources.admin.fgap; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Predicate; + +import jakarta.ws.rs.ForbiddenException; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.common.ClientModelIdentity; import org.keycloak.authorization.common.DefaultEvaluationContext; @@ -36,19 +49,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.authorization.Permission; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Predicate; - -import jakarta.ws.rs.ForbiddenException; - /** * Manages default policies for all users. * diff --git a/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionsV2.java b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionsV2.java index b2e2b274ed1..c4fd1c90cba 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionsV2.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/fgap/UserPermissionsV2.java @@ -20,9 +20,10 @@ import java.util.List; import java.util.Map; import jakarta.ws.rs.ForbiddenException; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.common.DefaultEvaluationContext; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.authorization.identity.UserModelIdentity; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java index 7274af61b2e..1ccfc3aee59 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java @@ -17,11 +17,25 @@ package org.keycloak.services.resources.admin.info; -import org.eclipse.microprofile.openapi.annotations.Operation; -import org.eclipse.microprofile.openapi.annotations.extensions.Extension; -import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.provider.ConfiguredPerClientProvider; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; + import org.keycloak.broker.provider.IdentityProvider; import org.keycloak.broker.provider.IdentityProviderFactory; import org.keycloak.broker.social.SocialIdentityProvider; @@ -45,6 +59,7 @@ import org.keycloak.protocol.ClientInstallationProvider; import org.keycloak.protocol.LoginProtocol; import org.keycloak.protocol.LoginProtocolFactory; import org.keycloak.protocol.ProtocolMapper; +import org.keycloak.provider.ConfiguredPerClientProvider; import org.keycloak.provider.ConfiguredProvider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderFactory; @@ -72,23 +87,10 @@ import org.keycloak.services.resources.admin.AdminAuth; import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.theme.Theme; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.MediaType; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.eclipse.microprofile.openapi.annotations.Operation; +import org.eclipse.microprofile.openapi.annotations.extensions.Extension; +import org.eclipse.microprofile.openapi.annotations.tags.Tag; +import org.jboss.resteasy.reactive.NoCache; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProvider.java b/services/src/main/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProvider.java index c62c6e53d6a..a1aac754a09 100644 --- a/services/src/main/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProvider.java +++ b/services/src/main/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProvider.java @@ -17,6 +17,7 @@ package org.keycloak.services.securityprofile; import java.util.List; + import org.keycloak.representations.idm.ClientPolicyRepresentation; import org.keycloak.representations.idm.ClientProfileRepresentation; import org.keycloak.representations.idm.SecurityProfileConfiguration; diff --git a/services/src/main/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProviderFactory.java b/services/src/main/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProviderFactory.java index 566dca5888b..7df97d03db1 100644 --- a/services/src/main/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProviderFactory.java +++ b/services/src/main/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProviderFactory.java @@ -19,7 +19,7 @@ package org.keycloak.services.securityprofile; import java.io.IOException; import java.io.InputStream; import java.util.List; -import org.jboss.logging.Logger; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; @@ -33,6 +33,8 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.FileUtils; +import org.jboss.logging.Logger; + /** * The default implementation for the security profile. It reads the configuration * from the file configured. diff --git a/services/src/main/java/org/keycloak/services/util/AuthenticationFlowURLHelper.java b/services/src/main/java/org/keycloak/services/util/AuthenticationFlowURLHelper.java index fdfdaebc239..6227dab7220 100644 --- a/services/src/main/java/org/keycloak/services/util/AuthenticationFlowURLHelper.java +++ b/services/src/main/java/org/keycloak/services/util/AuthenticationFlowURLHelper.java @@ -23,7 +23,6 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; import org.keycloak.authentication.AuthenticationProcessor; import org.keycloak.forms.login.LoginFormsProvider; import org.keycloak.models.Constants; @@ -33,6 +32,8 @@ import org.keycloak.protocol.AuthorizationEndpointBase; import org.keycloak.services.resources.LoginActionsService; import org.keycloak.sessions.AuthenticationSessionModel; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/services/src/main/java/org/keycloak/services/util/AuthorizationContextUtil.java b/services/src/main/java/org/keycloak/services/util/AuthorizationContextUtil.java index 664642c9049..3822b30007f 100644 --- a/services/src/main/java/org/keycloak/services/util/AuthorizationContextUtil.java +++ b/services/src/main/java/org/keycloak/services/util/AuthorizationContextUtil.java @@ -16,6 +16,8 @@ */ package org.keycloak.services.util; +import java.util.stream.Stream; + import org.keycloak.common.Profile; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; @@ -25,8 +27,6 @@ import org.keycloak.rar.AuthorizationDetails; import org.keycloak.rar.AuthorizationRequestContext; import org.keycloak.rar.AuthorizationRequestSource; -import java.util.stream.Stream; - /** * @author Daniel Gozalo diff --git a/services/src/main/java/org/keycloak/services/util/BrowserHistoryHelper.java b/services/src/main/java/org/keycloak/services/util/BrowserHistoryHelper.java index 58b739a4df7..e322821498a 100644 --- a/services/src/main/java/org/keycloak/services/util/BrowserHistoryHelper.java +++ b/services/src/main/java/org/keycloak/services/util/BrowserHistoryHelper.java @@ -23,12 +23,13 @@ import java.util.regex.Pattern; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakSession; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.utils.MediaType; +import org.jboss.logging.Logger; + /** * The point of this is to improve experience of browser history (back/forward/refresh buttons), but ensure there is no more redirects then necessary. * diff --git a/services/src/main/java/org/keycloak/services/util/CacheControlUtil.java b/services/src/main/java/org/keycloak/services/util/CacheControlUtil.java index 8e68b280f39..4fec855a9bd 100755 --- a/services/src/main/java/org/keycloak/services/util/CacheControlUtil.java +++ b/services/src/main/java/org/keycloak/services/util/CacheControlUtil.java @@ -17,13 +17,13 @@ package org.keycloak.services.util; -import org.keycloak.http.HttpResponse; +import jakarta.ws.rs.core.CacheControl; + import org.keycloak.Config; +import org.keycloak.http.HttpResponse; import org.keycloak.models.KeycloakContext; import org.keycloak.models.KeycloakSession; -import jakarta.ws.rs.core.CacheControl; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/services/util/CertificateInfoHelper.java b/services/src/main/java/org/keycloak/services/util/CertificateInfoHelper.java index 1ef92558809..38cd76d4d56 100644 --- a/services/src/main/java/org/keycloak/services/util/CertificateInfoHelper.java +++ b/services/src/main/java/org/keycloak/services/util/CertificateInfoHelper.java @@ -17,19 +17,19 @@ package org.keycloak.services.util; -import org.keycloak.models.ClientModel; -import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.representations.idm.CertificateRepresentation; -import org.keycloak.representations.idm.ClientRepresentation; - import java.io.IOException; import java.security.PublicKey; import java.util.HashMap; + import org.keycloak.jose.jwk.JSONWebKeySet; import org.keycloak.jose.jwk.JWK; import org.keycloak.jose.jwk.JWKParser; +import org.keycloak.models.ClientModel; +import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.oidc.OIDCConfigAttributes; import org.keycloak.protocol.oidc.OIDCLoginProtocol; +import org.keycloak.representations.idm.CertificateRepresentation; +import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.util.JWKSUtils; import org.keycloak.util.JsonSerialization; diff --git a/services/src/main/java/org/keycloak/services/util/Chunk.java b/services/src/main/java/org/keycloak/services/util/Chunk.java index 58a1d5e782a..0026b59bb9c 100644 --- a/services/src/main/java/org/keycloak/services/util/Chunk.java +++ b/services/src/main/java/org/keycloak/services/util/Chunk.java @@ -1,9 +1,9 @@ package org.keycloak.services.util; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.Optional; +import com.fasterxml.jackson.annotation.JsonProperty; + /** * Represents a chunk from the Vite build manifest (see {@link ViteManifest}). */ diff --git a/services/src/main/java/org/keycloak/services/util/DPoPUtil.java b/services/src/main/java/org/keycloak/services/util/DPoPUtil.java index 76ceffbe728..2510451a33a 100644 --- a/services/src/main/java/org/keycloak/services/util/DPoPUtil.java +++ b/services/src/main/java/org/keycloak/services/util/DPoPUtil.java @@ -33,7 +33,6 @@ import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import org.apache.commons.codec.binary.Hex; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.TokenVerifier; @@ -80,8 +79,10 @@ import org.keycloak.util.JWKSUtils; import org.keycloak.util.TokenUtil; import org.keycloak.utils.StringUtil; -import static org.keycloak.OAuth2Constants.DPOP_JWT_HEADER_TYPE; +import org.apache.commons.codec.binary.Hex; + import static org.keycloak.OAuth2Constants.DPOP_HTTP_HEADER; +import static org.keycloak.OAuth2Constants.DPOP_JWT_HEADER_TYPE; import static org.keycloak.utils.StringUtil.isNotBlank; /** diff --git a/services/src/main/java/org/keycloak/services/util/DefaultClientSessionContext.java b/services/src/main/java/org/keycloak/services/util/DefaultClientSessionContext.java index b3729ebb49d..fc3aa3549dd 100644 --- a/services/src/main/java/org/keycloak/services/util/DefaultClientSessionContext.java +++ b/services/src/main/java/org/keycloak/services/util/DefaultClientSessionContext.java @@ -26,7 +26,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.common.Profile; import org.keycloak.models.AuthenticatedClientSessionModel; @@ -47,6 +46,8 @@ import org.keycloak.rar.AuthorizationRequestContext; import org.keycloak.rar.AuthorizationRequestSource; import org.keycloak.util.TokenUtil; +import org.jboss.logging.Logger; + /** * Not thread safe. It's per-request object * diff --git a/services/src/main/java/org/keycloak/services/util/LocaleUtil.java b/services/src/main/java/org/keycloak/services/util/LocaleUtil.java index a40fd5914dc..d22335ab6bb 100644 --- a/services/src/main/java/org/keycloak/services/util/LocaleUtil.java +++ b/services/src/main/java/org/keycloak/services/util/LocaleUtil.java @@ -18,12 +18,6 @@ package org.keycloak.services.util; -import org.keycloak.locale.LocaleSelectorProvider; -import org.keycloak.locale.LocaleUpdaterProvider; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.sessions.AuthenticationSessionModel; - import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; @@ -32,6 +26,12 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; +import org.keycloak.locale.LocaleSelectorProvider; +import org.keycloak.locale.LocaleUpdaterProvider; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.sessions.AuthenticationSessionModel; + /** * @author Marek Posolda * @author Daniel Fesenmeyer diff --git a/services/src/main/java/org/keycloak/services/util/MtlsHoKTokenUtil.java b/services/src/main/java/org/keycloak/services/util/MtlsHoKTokenUtil.java index 58eb0a4bc30..06198b43c4b 100644 --- a/services/src/main/java/org/keycloak/services/util/MtlsHoKTokenUtil.java +++ b/services/src/main/java/org/keycloak/services/util/MtlsHoKTokenUtil.java @@ -6,13 +6,14 @@ import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; import org.keycloak.common.util.Base64Url; +import org.keycloak.http.HttpRequest; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.AccessToken; import org.keycloak.services.x509.X509ClientCertificateLookup; +import org.jboss.logging.Logger; + public class MtlsHoKTokenUtil { // KEYCLOAK-6771 Certificate Bound Token // https://tools.ietf.org/html/draft-ietf-oauth-mtls-08#section-3.1 diff --git a/services/src/main/java/org/keycloak/services/util/ObjectMapperResolver.java b/services/src/main/java/org/keycloak/services/util/ObjectMapperResolver.java index 05ed3adf98c..7a94585e7a7 100644 --- a/services/src/main/java/org/keycloak/services/util/ObjectMapperResolver.java +++ b/services/src/main/java/org/keycloak/services/util/ObjectMapperResolver.java @@ -17,6 +17,11 @@ package org.keycloak.services.util; +import java.util.stream.Stream; + +import jakarta.ws.rs.ext.ContextResolver; +import jakarta.ws.rs.ext.Provider; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; @@ -25,10 +30,6 @@ import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.type.TypeFactory; import com.fasterxml.jackson.datatype.jdk8.StreamSerializer; -import jakarta.ws.rs.ext.ContextResolver; -import jakarta.ws.rs.ext.Provider; -import java.util.stream.Stream; - /** * Any class with package org.jboss.resteasy.skeleton.key will use NON_DEFAULT inclusion * diff --git a/services/src/main/java/org/keycloak/services/util/ResolveRelative.java b/services/src/main/java/org/keycloak/services/util/ResolveRelative.java index 900a5477f00..294d6b7912d 100755 --- a/services/src/main/java/org/keycloak/services/util/ResolveRelative.java +++ b/services/src/main/java/org/keycloak/services/util/ResolveRelative.java @@ -17,13 +17,13 @@ package org.keycloak.services.util; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.common.util.StringPropertyReplacer; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.urls.UrlType; -import jakarta.ws.rs.core.UriBuilder; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/util/ScopeMappedUtil.java b/services/src/main/java/org/keycloak/services/util/ScopeMappedUtil.java index 1ae91e6ccd8..bf0e1a68ea2 100644 --- a/services/src/main/java/org/keycloak/services/util/ScopeMappedUtil.java +++ b/services/src/main/java/org/keycloak/services/util/ScopeMappedUtil.java @@ -17,6 +17,9 @@ package org.keycloak.services.util; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.models.ClientModel; import org.keycloak.models.ScopeContainerModel; import org.keycloak.models.utils.KeycloakModelUtils; @@ -24,9 +27,6 @@ import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.ClientMappingsRepresentation; import org.keycloak.representations.idm.RoleRepresentation; -import java.util.List; -import java.util.stream.Collectors; - public class ScopeMappedUtil { public static ClientMappingsRepresentation toClientMappingsRepresentation(ClientModel client, ScopeContainerModel scopeContainer) { List roles = KeycloakModelUtils.getClientScopeMappingsStream(client, scopeContainer) diff --git a/services/src/main/java/org/keycloak/services/util/UserSessionUtil.java b/services/src/main/java/org/keycloak/services/util/UserSessionUtil.java index b5b03b95a61..98a3bd4f76c 100644 --- a/services/src/main/java/org/keycloak/services/util/UserSessionUtil.java +++ b/services/src/main/java/org/keycloak/services/util/UserSessionUtil.java @@ -3,7 +3,6 @@ package org.keycloak.services.util; import java.util.Objects; import java.util.function.Consumer; -import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; @@ -33,6 +32,8 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.util.TokenUtil; +import org.jboss.logging.Logger; + public class UserSessionUtil { private static final Logger logger = Logger.getLogger(UserSessionUtil.class); diff --git a/services/src/main/java/org/keycloak/services/util/ViteManifest.java b/services/src/main/java/org/keycloak/services/util/ViteManifest.java index 905546e0eb8..85b9a577e62 100644 --- a/services/src/main/java/org/keycloak/services/util/ViteManifest.java +++ b/services/src/main/java/org/keycloak/services/util/ViteManifest.java @@ -1,12 +1,13 @@ package org.keycloak.services.util; -import com.fasterxml.jackson.core.type.TypeReference; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.io.InputStream; import java.util.HashMap; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.type.TypeReference; + /** * This class is used to parse the Vite manifest file which is generated by the build, this file contains * a mapping of non-hashed asset filenames to their hashed versions, which can then be used to render the diff --git a/services/src/main/java/org/keycloak/services/validation/Validation.java b/services/src/main/java/org/keycloak/services/validation/Validation.java index c4d387ca353..527c0544076 100755 --- a/services/src/main/java/org/keycloak/services/validation/Validation.java +++ b/services/src/main/java/org/keycloak/services/validation/Validation.java @@ -17,14 +17,14 @@ package org.keycloak.services.validation; -import org.keycloak.models.utils.FormMessage; -import org.keycloak.userprofile.ValidationException; -import org.keycloak.utils.EmailValidationUtil; - import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; +import org.keycloak.models.utils.FormMessage; +import org.keycloak.userprofile.ValidationException; +import org.keycloak.utils.EmailValidationUtil; + public class Validation { public static final String FIELD_PASSWORD_CONFIRM = "password-confirm"; diff --git a/services/src/main/java/org/keycloak/services/x509/AbstractClientCertificateFromHttpHeadersLookup.java b/services/src/main/java/org/keycloak/services/x509/AbstractClientCertificateFromHttpHeadersLookup.java index 4cce3e4cdb9..fa1be9ddaa3 100644 --- a/services/src/main/java/org/keycloak/services/x509/AbstractClientCertificateFromHttpHeadersLookup.java +++ b/services/src/main/java/org/keycloak/services/x509/AbstractClientCertificateFromHttpHeadersLookup.java @@ -18,15 +18,16 @@ package org.keycloak.services.x509; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; -import org.keycloak.common.util.PemException; - import java.security.GeneralSecurityException; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.List; +import org.keycloak.common.util.PemException; +import org.keycloak.http.HttpRequest; + +import org.jboss.logging.Logger; + /** * * @author Peter Nalyvayko diff --git a/services/src/main/java/org/keycloak/services/x509/AbstractClientCertificateFromHttpHeadersLookupFactory.java b/services/src/main/java/org/keycloak/services/x509/AbstractClientCertificateFromHttpHeadersLookupFactory.java index 1eae86408b7..e0f99cd48da 100644 --- a/services/src/main/java/org/keycloak/services/x509/AbstractClientCertificateFromHttpHeadersLookupFactory.java +++ b/services/src/main/java/org/keycloak/services/x509/AbstractClientCertificateFromHttpHeadersLookupFactory.java @@ -18,10 +18,11 @@ package org.keycloak.services.x509; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.models.KeycloakSessionFactory; +import org.jboss.logging.Logger; + /** * @author Peter Nalyvayko * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/services/x509/ApacheProxySslClientCertificateLookup.java b/services/src/main/java/org/keycloak/services/x509/ApacheProxySslClientCertificateLookup.java index a337ab90f78..bb3b076c64b 100644 --- a/services/src/main/java/org/keycloak/services/x509/ApacheProxySslClientCertificateLookup.java +++ b/services/src/main/java/org/keycloak/services/x509/ApacheProxySslClientCertificateLookup.java @@ -18,11 +18,11 @@ package org.keycloak.services.x509; +import java.security.cert.X509Certificate; + import org.keycloak.common.util.PemException; import org.keycloak.common.util.PemUtils; -import java.security.cert.X509Certificate; - /** * The provider allows to extract X.509 client certificate forwarded * to keycloak configured behind the Apache reverse proxy. diff --git a/services/src/main/java/org/keycloak/services/x509/DefaultClientCertificateLookup.java b/services/src/main/java/org/keycloak/services/x509/DefaultClientCertificateLookup.java index 7b2c735fad5..005ba9d61e2 100644 --- a/services/src/main/java/org/keycloak/services/x509/DefaultClientCertificateLookup.java +++ b/services/src/main/java/org/keycloak/services/x509/DefaultClientCertificateLookup.java @@ -18,10 +18,12 @@ package org.keycloak.services.x509; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; import java.security.cert.X509Certificate; +import org.keycloak.http.HttpRequest; + +import org.jboss.logging.Logger; + /** * The provider retrieves a client certificate and the certificate chain * (if any) from the incoming TLS connection. diff --git a/services/src/main/java/org/keycloak/services/x509/HaProxySslClientCertificateLookup.java b/services/src/main/java/org/keycloak/services/x509/HaProxySslClientCertificateLookup.java index a3d270cb69d..8ccc3b93518 100644 --- a/services/src/main/java/org/keycloak/services/x509/HaProxySslClientCertificateLookup.java +++ b/services/src/main/java/org/keycloak/services/x509/HaProxySslClientCertificateLookup.java @@ -18,11 +18,12 @@ package org.keycloak.services.x509; -import org.jboss.logging.Logger; +import java.security.cert.X509Certificate; + import org.keycloak.common.util.PemException; import org.keycloak.common.util.PemUtils; -import java.security.cert.X509Certificate; +import org.jboss.logging.Logger; /** * The provider allows to extract X.509 client certificate forwarded diff --git a/services/src/main/java/org/keycloak/services/x509/NginxProxySslClientCertificateLookup.java b/services/src/main/java/org/keycloak/services/x509/NginxProxySslClientCertificateLookup.java index f7c6ad7d2aa..3fd01cec6dc 100644 --- a/services/src/main/java/org/keycloak/services/x509/NginxProxySslClientCertificateLookup.java +++ b/services/src/main/java/org/keycloak/services/x509/NginxProxySslClientCertificateLookup.java @@ -20,12 +20,13 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import org.jboss.logging.Logger; -import org.jboss.logging.Logger.Level; -import org.keycloak.http.HttpRequest; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.util.PemException; import org.keycloak.common.util.PemUtils; +import org.keycloak.http.HttpRequest; + +import org.jboss.logging.Logger; +import org.jboss.logging.Logger.Level; /** * The NGINX Provider extract end user X.509 certificate send during TLS mutual authentication, diff --git a/services/src/main/java/org/keycloak/services/x509/NginxProxySslClientCertificateLookupFactory.java b/services/src/main/java/org/keycloak/services/x509/NginxProxySslClientCertificateLookupFactory.java index 94cd45401cc..4e83c1e1a36 100644 --- a/services/src/main/java/org/keycloak/services/x509/NginxProxySslClientCertificateLookupFactory.java +++ b/services/src/main/java/org/keycloak/services/x509/NginxProxySslClientCertificateLookupFactory.java @@ -1,16 +1,17 @@ package org.keycloak.services.x509; -import org.jboss.logging.Logger; +import java.security.cert.X509Certificate; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.truststore.TruststoreProvider; import org.keycloak.truststore.TruststoreProviderFactory; -import java.security.cert.X509Certificate; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; +import org.jboss.logging.Logger; /** * The factory and the corresponding providers extract a client certificate diff --git a/services/src/main/java/org/keycloak/services/x509/NginxProxyTrustedClientCertificateLookup.java b/services/src/main/java/org/keycloak/services/x509/NginxProxyTrustedClientCertificateLookup.java index fed3c49918d..c3a2ead9297 100644 --- a/services/src/main/java/org/keycloak/services/x509/NginxProxyTrustedClientCertificateLookup.java +++ b/services/src/main/java/org/keycloak/services/x509/NginxProxyTrustedClientCertificateLookup.java @@ -1,14 +1,15 @@ package org.keycloak.services.x509; -import org.jboss.logging.Logger; -import org.keycloak.http.HttpRequest; -import org.keycloak.common.util.PemException; -import org.keycloak.common.util.PemUtils; - import java.nio.charset.StandardCharsets; import java.security.GeneralSecurityException; import java.security.cert.X509Certificate; +import org.keycloak.common.util.PemException; +import org.keycloak.common.util.PemUtils; +import org.keycloak.http.HttpRequest; + +import org.jboss.logging.Logger; + /** * The NGINX Trusted Provider verify extract end user X.509 certificate sent during TLS mutual authentication, * verifies it against provided CA the and forwarded in an HTTP header along with a new header ssl-client-verify: SUCCESS. diff --git a/services/src/main/java/org/keycloak/services/x509/X509ClientCertificateLookup.java b/services/src/main/java/org/keycloak/services/x509/X509ClientCertificateLookup.java index e10c077f866..66edf955d9f 100644 --- a/services/src/main/java/org/keycloak/services/x509/X509ClientCertificateLookup.java +++ b/services/src/main/java/org/keycloak/services/x509/X509ClientCertificateLookup.java @@ -18,12 +18,12 @@ package org.keycloak.services.x509; -import org.keycloak.http.HttpRequest; -import org.keycloak.provider.Provider; - import java.security.GeneralSecurityException; import java.security.cert.X509Certificate; +import org.keycloak.http.HttpRequest; +import org.keycloak.provider.Provider; + /** * @author Peter Nalyvayko * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/social/bitbucket/BitbucketIdentityProvider.java b/services/src/main/java/org/keycloak/social/bitbucket/BitbucketIdentityProvider.java index 86b5bae32a0..2e5aab818d4 100755 --- a/services/src/main/java/org/keycloak/social/bitbucket/BitbucketIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/bitbucket/BitbucketIdentityProvider.java @@ -17,7 +17,10 @@ package org.keycloak.social.bitbucket; -import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; + +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuthErrorException; import org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider; import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; @@ -33,8 +36,7 @@ import org.keycloak.http.simple.SimpleHttpResponse; import org.keycloak.models.KeycloakSession; import org.keycloak.services.ErrorResponseException; -import jakarta.ws.rs.core.Response; -import java.io.IOException; +import com.fasterxml.jackson.databind.JsonNode; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/social/facebook/FacebookIdentityProvider.java b/services/src/main/java/org/keycloak/social/facebook/FacebookIdentityProvider.java index 318e735ee5a..cb262f13874 100755 --- a/services/src/main/java/org/keycloak/social/facebook/FacebookIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/facebook/FacebookIdentityProvider.java @@ -17,10 +17,11 @@ package org.keycloak.social.facebook; -import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider; @@ -35,7 +36,7 @@ import org.keycloak.protocol.oidc.TokenExchangeContext; import org.keycloak.saml.common.util.StringUtil; import org.keycloak.services.ErrorResponseException; -import java.io.IOException; +import com.fasterxml.jackson.databind.JsonNode; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/social/facebook/FacebookIdentityProviderFactory.java b/services/src/main/java/org/keycloak/social/facebook/FacebookIdentityProviderFactory.java index df32a5175c4..bdbd0e78d4d 100755 --- a/services/src/main/java/org/keycloak/social/facebook/FacebookIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/social/facebook/FacebookIdentityProviderFactory.java @@ -16,6 +16,8 @@ */ package org.keycloak.social.facebook; +import java.util.List; + import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; import org.keycloak.broker.provider.AbstractIdentityProviderFactory; import org.keycloak.broker.social.SocialIdentityProviderFactory; @@ -24,8 +26,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; - /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/social/github/GitHubIdentityProvider.java b/services/src/main/java/org/keycloak/social/github/GitHubIdentityProvider.java index 845c697629c..02e41493d47 100755 --- a/services/src/main/java/org/keycloak/social/github/GitHubIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/github/GitHubIdentityProvider.java @@ -17,13 +17,12 @@ package org.keycloak.social.github; -import com.fasterxml.jackson.databind.JsonNode; -import jakarta.ws.rs.core.Response; - import java.io.IOException; import java.util.Iterator; import java.util.Map; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider; @@ -41,6 +40,8 @@ import org.keycloak.protocol.oidc.TokenExchangeContext; import org.keycloak.services.ErrorResponseException; import org.keycloak.util.BasicAuthHelper; +import com.fasterxml.jackson.databind.JsonNode; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/social/github/GitHubIdentityProviderFactory.java b/services/src/main/java/org/keycloak/social/github/GitHubIdentityProviderFactory.java index 1e32bd7acb8..9189ab180c4 100755 --- a/services/src/main/java/org/keycloak/social/github/GitHubIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/social/github/GitHubIdentityProviderFactory.java @@ -16,16 +16,16 @@ */ package org.keycloak.social.github; +import java.util.List; + import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; import org.keycloak.broker.provider.AbstractIdentityProviderFactory; -import org.keycloak.models.IdentityProviderModel; import org.keycloak.broker.social.SocialIdentityProviderFactory; +import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; - /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/social/gitlab/GitLabIdentityProvider.java b/services/src/main/java/org/keycloak/social/gitlab/GitLabIdentityProvider.java index 9a654a69618..13fb70220ec 100755 --- a/services/src/main/java/org/keycloak/social/gitlab/GitLabIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/gitlab/GitLabIdentityProvider.java @@ -17,7 +17,11 @@ package org.keycloak.social.gitlab; -import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; + +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.broker.oidc.OIDCIdentityProvider; @@ -37,9 +41,7 @@ import org.keycloak.representations.IDToken; import org.keycloak.representations.JsonWebToken; import org.keycloak.services.ErrorResponseException; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import java.io.IOException; +import com.fasterxml.jackson.databind.JsonNode; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java b/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java index 4c5f85ec8c6..c76a9e45c7c 100755 --- a/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/google/GoogleIdentityProvider.java @@ -16,10 +16,12 @@ */ package org.keycloak.social.google; -import com.fasterxml.jackson.databind.JsonNode; +import java.util.List; + import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.broker.oidc.OIDCIdentityProvider; @@ -39,7 +41,7 @@ import org.keycloak.protocol.oidc.TokenExchangeContext; import org.keycloak.representations.JsonWebToken; import org.keycloak.services.ErrorResponseException; -import java.util.List; +import com.fasterxml.jackson.databind.JsonNode; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/social/google/GoogleIdentityProviderFactory.java b/services/src/main/java/org/keycloak/social/google/GoogleIdentityProviderFactory.java index c5aafefd3c9..19045097d7f 100755 --- a/services/src/main/java/org/keycloak/social/google/GoogleIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/social/google/GoogleIdentityProviderFactory.java @@ -16,15 +16,15 @@ */ package org.keycloak.social.google; +import java.util.List; + import org.keycloak.broker.provider.AbstractIdentityProviderFactory; -import org.keycloak.models.IdentityProviderModel; import org.keycloak.broker.social.SocialIdentityProviderFactory; +import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; - /** * @author Pedro Igor */ diff --git a/services/src/main/java/org/keycloak/social/instagram/InstagramIdentityProvider.java b/services/src/main/java/org/keycloak/social/instagram/InstagramIdentityProvider.java index c1cdf9be938..4ef992ebd45 100755 --- a/services/src/main/java/org/keycloak/social/instagram/InstagramIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/instagram/InstagramIdentityProvider.java @@ -17,7 +17,8 @@ package org.keycloak.social.instagram; -import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; + import org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider; import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper; @@ -27,7 +28,7 @@ import org.keycloak.broker.social.SocialIdentityProvider; import org.keycloak.http.simple.SimpleHttp; import org.keycloak.models.KeycloakSession; -import java.io.IOException; +import com.fasterxml.jackson.databind.JsonNode; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/social/linkedin/LinkedInOIDCIdentityProviderFactory.java b/services/src/main/java/org/keycloak/social/linkedin/LinkedInOIDCIdentityProviderFactory.java index 8f29c472da6..d440d363c56 100644 --- a/services/src/main/java/org/keycloak/social/linkedin/LinkedInOIDCIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/social/linkedin/LinkedInOIDCIdentityProviderFactory.java @@ -16,11 +16,13 @@ */ package org.keycloak.social.linkedin; +import java.io.IOException; +import java.util.List; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.io.IOException; -import java.util.List; + import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.broker.provider.AbstractIdentityProviderFactory; import org.keycloak.broker.social.SocialIdentityProviderFactory; diff --git a/services/src/main/java/org/keycloak/social/microsoft/MicrosoftIdentityProvider.java b/services/src/main/java/org/keycloak/social/microsoft/MicrosoftIdentityProvider.java index 765c2c88e1e..7ea5550a807 100755 --- a/services/src/main/java/org/keycloak/social/microsoft/MicrosoftIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/microsoft/MicrosoftIdentityProvider.java @@ -17,8 +17,8 @@ package org.keycloak.social.microsoft; -import com.fasterxml.jackson.databind.JsonNode; -import org.jboss.logging.Logger; +import java.util.Optional; + import org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider; import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -29,7 +29,8 @@ import org.keycloak.http.simple.SimpleHttp; import org.keycloak.models.KeycloakSession; import org.keycloak.services.validation.Validation; -import java.util.Optional; +import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; /** * diff --git a/services/src/main/java/org/keycloak/social/microsoft/MicrosoftIdentityProviderFactory.java b/services/src/main/java/org/keycloak/social/microsoft/MicrosoftIdentityProviderFactory.java index 7352a74cbe4..03dda832a99 100644 --- a/services/src/main/java/org/keycloak/social/microsoft/MicrosoftIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/social/microsoft/MicrosoftIdentityProviderFactory.java @@ -16,6 +16,8 @@ */ package org.keycloak.social.microsoft; +import java.util.List; + import org.keycloak.broker.provider.AbstractIdentityProviderFactory; import org.keycloak.broker.social.SocialIdentityProviderFactory; import org.keycloak.models.IdentityProviderModel; @@ -23,8 +25,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; - /** * @author Vlastimil Elias (velias at redhat dot com) */ diff --git a/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProvider.java b/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProvider.java index b3ab46599c8..614a6a22e97 100644 --- a/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProvider.java @@ -1,10 +1,10 @@ package org.keycloak.social.openshift; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; +import java.util.Optional; + import org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider; import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -15,10 +15,11 @@ import org.keycloak.events.EventBuilder; import org.keycloak.http.simple.SimpleHttp; import org.keycloak.models.KeycloakSession; -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; -import java.util.Optional; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; /** * Identity provider for Openshift V4. diff --git a/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderConfig.java b/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderConfig.java index 9dd2f765b8f..e1bc485464f 100644 --- a/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderConfig.java +++ b/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderConfig.java @@ -1,12 +1,12 @@ package org.keycloak.social.openshift; +import java.util.List; + import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; import org.keycloak.models.IdentityProviderModel; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; - /** * OpenShift 4 Identity Provider configuration class. * diff --git a/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderFactory.java b/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderFactory.java index 28761c8e299..7468fac32ba 100644 --- a/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderFactory.java @@ -1,13 +1,13 @@ package org.keycloak.social.openshift; +import java.util.List; + import org.keycloak.broker.provider.AbstractIdentityProviderFactory; import org.keycloak.broker.social.SocialIdentityProviderFactory; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * OpenShift 4 Identity Provider factory class. * diff --git a/services/src/main/java/org/keycloak/social/paypal/PayPalIdentityProvider.java b/services/src/main/java/org/keycloak/social/paypal/PayPalIdentityProvider.java index 85352474a52..9c8bff6b515 100644 --- a/services/src/main/java/org/keycloak/social/paypal/PayPalIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/paypal/PayPalIdentityProvider.java @@ -17,7 +17,6 @@ package org.keycloak.social.paypal; -import com.fasterxml.jackson.databind.JsonNode; import org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider; import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -27,6 +26,8 @@ import org.keycloak.events.EventBuilder; import org.keycloak.http.simple.SimpleHttp; import org.keycloak.models.KeycloakSession; +import com.fasterxml.jackson.databind.JsonNode; + /** * @author Petter Lysne (petterlysne at hotmail dot com) */ diff --git a/services/src/main/java/org/keycloak/social/paypal/PayPalIdentityProviderFactory.java b/services/src/main/java/org/keycloak/social/paypal/PayPalIdentityProviderFactory.java index 6c497db8f29..52e2e235ec7 100644 --- a/services/src/main/java/org/keycloak/social/paypal/PayPalIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/social/paypal/PayPalIdentityProviderFactory.java @@ -16,15 +16,15 @@ */ package org.keycloak.social.paypal; +import java.util.List; + import org.keycloak.broker.provider.AbstractIdentityProviderFactory; -import org.keycloak.models.IdentityProviderModel; import org.keycloak.broker.social.SocialIdentityProviderFactory; +import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; - /** * @author Petter Lysne */ diff --git a/services/src/main/java/org/keycloak/social/stackoverflow/StackoverflowIdentityProvider.java b/services/src/main/java/org/keycloak/social/stackoverflow/StackoverflowIdentityProvider.java index 6568bcad026..e4c4e30f3b8 100755 --- a/services/src/main/java/org/keycloak/social/stackoverflow/StackoverflowIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/stackoverflow/StackoverflowIdentityProvider.java @@ -16,8 +16,13 @@ */ package org.keycloak.social.stackoverflow; -import com.fasterxml.jackson.databind.JsonNode; -import org.jboss.logging.Logger; +import java.io.StringWriter; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; + import org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider; import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -28,12 +33,8 @@ import org.keycloak.http.simple.SimpleHttp; import org.keycloak.http.simple.SimpleHttpRequest; import org.keycloak.models.KeycloakSession; -import java.io.StringWriter; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLDecoder; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; +import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; /** * Stackoverflow social provider. See https://api.stackexchange.com/docs/authentication diff --git a/services/src/main/java/org/keycloak/social/stackoverflow/StackoverflowIdentityProviderFactory.java b/services/src/main/java/org/keycloak/social/stackoverflow/StackoverflowIdentityProviderFactory.java index 40d7e5b5e5d..656f992b008 100755 --- a/services/src/main/java/org/keycloak/social/stackoverflow/StackoverflowIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/social/stackoverflow/StackoverflowIdentityProviderFactory.java @@ -16,15 +16,15 @@ */ package org.keycloak.social.stackoverflow; +import java.util.List; + import org.keycloak.broker.provider.AbstractIdentityProviderFactory; -import org.keycloak.models.IdentityProviderModel; import org.keycloak.broker.social.SocialIdentityProviderFactory; +import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; - /** * @author Vlastimil Elias (velias at redhat dot com) */ diff --git a/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java b/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java index f8aeed98038..d40ead63cd2 100755 --- a/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java +++ b/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProvider.java @@ -16,7 +16,24 @@ */ package org.keycloak.social.twitter; -import org.jboss.logging.Logger; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.util.Base64; + +import jakarta.ws.rs.GET; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriInfo; + import org.keycloak.OAuth2Constants; import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; import org.keycloak.broker.provider.AbstractIdentityProvider; @@ -44,29 +61,14 @@ import org.keycloak.services.messages.Messages; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.util.Booleans; import org.keycloak.vault.VaultStringSecret; + +import org.jboss.logging.Logger; import twitter4j.AccessToken; import twitter4j.OAuthAuthorization; import twitter4j.RequestToken; import twitter4j.Twitter; import twitter4j.v1.User; -import java.io.ByteArrayInputStream; -import java.io.ObjectInputStream; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriInfo; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectOutputStream; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.util.Base64; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProviderFactory.java b/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProviderFactory.java index 79b2754722d..6516bfa19cd 100755 --- a/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProviderFactory.java +++ b/services/src/main/java/org/keycloak/social/twitter/TwitterIdentityProviderFactory.java @@ -18,8 +18,8 @@ package org.keycloak.social.twitter; import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; import org.keycloak.broker.provider.AbstractIdentityProviderFactory; -import org.keycloak.models.IdentityProviderModel; import org.keycloak.broker.social.SocialIdentityProviderFactory; +import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.KeycloakSession; /** diff --git a/services/src/main/java/org/keycloak/theme/ClassLoaderTheme.java b/services/src/main/java/org/keycloak/theme/ClassLoaderTheme.java index 440bf595b17..b9752db6fc1 100644 --- a/services/src/main/java/org/keycloak/theme/ClassLoaderTheme.java +++ b/services/src/main/java/org/keycloak/theme/ClassLoaderTheme.java @@ -17,9 +17,6 @@ package org.keycloak.theme; -import org.keycloak.models.RealmModel; -import org.keycloak.services.util.LocaleUtil; - import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -28,6 +25,9 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; +import org.keycloak.models.RealmModel; +import org.keycloak.services.util.LocaleUtil; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/theme/ClasspathThemeProviderFactory.java b/services/src/main/java/org/keycloak/theme/ClasspathThemeProviderFactory.java index fededd30c97..0e262ccd36a 100755 --- a/services/src/main/java/org/keycloak/theme/ClasspathThemeProviderFactory.java +++ b/services/src/main/java/org/keycloak/theme/ClasspathThemeProviderFactory.java @@ -17,15 +17,15 @@ package org.keycloak.theme; +import java.io.InputStream; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.util.JsonSerialization; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/theme/DateTimeFormatterUtil.java b/services/src/main/java/org/keycloak/theme/DateTimeFormatterUtil.java index 57790aec611..2b877a76ccb 100644 --- a/services/src/main/java/org/keycloak/theme/DateTimeFormatterUtil.java +++ b/services/src/main/java/org/keycloak/theme/DateTimeFormatterUtil.java @@ -17,13 +17,13 @@ package org.keycloak.theme; -import org.jboss.logging.Logger; - import java.text.DateFormat; import java.util.Date; import java.util.Locale; import java.util.Optional; +import org.jboss.logging.Logger; + /** * Util class for localized date and time representation * diff --git a/services/src/main/java/org/keycloak/theme/DefaultThemeManager.java b/services/src/main/java/org/keycloak/theme/DefaultThemeManager.java index a86c064d962..f2b7e6893cb 100755 --- a/services/src/main/java/org/keycloak/theme/DefaultThemeManager.java +++ b/services/src/main/java/org/keycloak/theme/DefaultThemeManager.java @@ -17,13 +17,6 @@ package org.keycloak.theme; -import org.jboss.logging.Logger; -import org.keycloak.common.util.StringPropertyReplacer; -import org.keycloak.common.util.SystemEnvProperties; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.models.ThemeManager; - import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -42,8 +35,15 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import org.keycloak.common.util.StringPropertyReplacer; +import org.keycloak.common.util.SystemEnvProperties; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.models.ThemeManager; import org.keycloak.services.util.LocaleUtil; +import org.jboss.logging.Logger; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/theme/DefaultThemeManagerFactory.java b/services/src/main/java/org/keycloak/theme/DefaultThemeManagerFactory.java index ded9637ef2c..6906b0958ab 100644 --- a/services/src/main/java/org/keycloak/theme/DefaultThemeManagerFactory.java +++ b/services/src/main/java/org/keycloak/theme/DefaultThemeManagerFactory.java @@ -17,13 +17,14 @@ package org.keycloak.theme; -import org.jboss.logging.Logger; +import java.util.concurrent.ConcurrentHashMap; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.ThemeManager; -import java.util.concurrent.ConcurrentHashMap; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/theme/DefaultThemeSelectorProvider.java b/services/src/main/java/org/keycloak/theme/DefaultThemeSelectorProvider.java index 9208fa6fc4b..4dfe257277c 100644 --- a/services/src/main/java/org/keycloak/theme/DefaultThemeSelectorProvider.java +++ b/services/src/main/java/org/keycloak/theme/DefaultThemeSelectorProvider.java @@ -56,4 +56,3 @@ public class DefaultThemeSelectorProvider implements ThemeSelectorProvider { } } - diff --git a/services/src/main/java/org/keycloak/theme/FolderTheme.java b/services/src/main/java/org/keycloak/theme/FolderTheme.java index 10914c6dd09..fbb0445ee41 100644 --- a/services/src/main/java/org/keycloak/theme/FolderTheme.java +++ b/services/src/main/java/org/keycloak/theme/FolderTheme.java @@ -17,9 +17,6 @@ package org.keycloak.theme; -import org.keycloak.models.RealmModel; -import org.keycloak.services.util.LocaleUtil; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -31,6 +28,9 @@ import java.util.Map; import java.util.Properties; import java.util.regex.Pattern; +import org.keycloak.models.RealmModel; +import org.keycloak.services.util.LocaleUtil; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java b/services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java index 38ae742a08a..8683f7f0963 100755 --- a/services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java +++ b/services/src/main/java/org/keycloak/theme/FolderThemeProviderFactory.java @@ -17,12 +17,12 @@ package org.keycloak.theme; +import java.io.File; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; -import java.io.File; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java b/services/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java index 425c2541b74..e078898c2c3 100755 --- a/services/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java +++ b/services/src/main/java/org/keycloak/theme/JarThemeProviderFactory.java @@ -17,13 +17,13 @@ package org.keycloak.theme; -import org.keycloak.Config; -import org.keycloak.models.KeycloakSession; - import java.io.IOException; import java.net.URL; import java.util.Enumeration; +import org.keycloak.Config; +import org.keycloak.models.KeycloakSession; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/theme/KeycloakSanitizerMethod.java b/services/src/main/java/org/keycloak/theme/KeycloakSanitizerMethod.java index e28d2e0ab79..cdbce9b6c50 100644 --- a/services/src/main/java/org/keycloak/theme/KeycloakSanitizerMethod.java +++ b/services/src/main/java/org/keycloak/theme/KeycloakSanitizerMethod.java @@ -17,14 +17,14 @@ package org.keycloak.theme; -import freemarker.template.TemplateMethodModelEx; -import freemarker.template.TemplateModelException; -import org.owasp.html.Encoding; - import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import freemarker.template.TemplateMethodModelEx; +import freemarker.template.TemplateModelException; +import org.owasp.html.Encoding; + /** * Allows sanitizing of html that uses Freemarker ?no_esc. This way, html * can be allowed but it is still cleaned up for safety. Tags and attributes diff --git a/services/src/main/java/org/keycloak/theme/KeycloakSanitizerPolicy.java b/services/src/main/java/org/keycloak/theme/KeycloakSanitizerPolicy.java index 414092b9e2e..14219ddefc7 100644 --- a/services/src/main/java/org/keycloak/theme/KeycloakSanitizerPolicy.java +++ b/services/src/main/java/org/keycloak/theme/KeycloakSanitizerPolicy.java @@ -17,8 +17,8 @@ package org.keycloak.theme; -import java.util.regex.Pattern; import java.util.function.Predicate; +import java.util.regex.Pattern; import org.owasp.html.HtmlPolicyBuilder; import org.owasp.html.PolicyFactory; diff --git a/services/src/main/java/org/keycloak/theme/beans/AdvancedMessageFormatterMethod.java b/services/src/main/java/org/keycloak/theme/beans/AdvancedMessageFormatterMethod.java index 2cb906a7d42..565d5f5b57a 100755 --- a/services/src/main/java/org/keycloak/theme/beans/AdvancedMessageFormatterMethod.java +++ b/services/src/main/java/org/keycloak/theme/beans/AdvancedMessageFormatterMethod.java @@ -17,14 +17,14 @@ package org.keycloak.theme.beans; -import freemarker.template.TemplateMethodModelEx; -import freemarker.template.TemplateModelException; - import java.text.MessageFormat; import java.util.List; import java.util.Locale; import java.util.Properties; +import freemarker.template.TemplateMethodModelEx; +import freemarker.template.TemplateModelException; + /** * @author Michael Gerber */ diff --git a/services/src/main/java/org/keycloak/theme/beans/LocaleBean.java b/services/src/main/java/org/keycloak/theme/beans/LocaleBean.java index 7b91a07d284..53dee82342e 100755 --- a/services/src/main/java/org/keycloak/theme/beans/LocaleBean.java +++ b/services/src/main/java/org/keycloak/theme/beans/LocaleBean.java @@ -17,10 +17,6 @@ package org.keycloak.theme.beans; -import org.keycloak.models.RealmModel; - -import jakarta.ws.rs.core.UriBuilder; - import java.text.Bidi; import java.text.Collator; import java.util.List; @@ -28,6 +24,10 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; +import jakarta.ws.rs.core.UriBuilder; + +import org.keycloak.models.RealmModel; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/theme/beans/MessageFormatterMethod.java b/services/src/main/java/org/keycloak/theme/beans/MessageFormatterMethod.java index 3590b0f0c77..2851c6c1d4c 100755 --- a/services/src/main/java/org/keycloak/theme/beans/MessageFormatterMethod.java +++ b/services/src/main/java/org/keycloak/theme/beans/MessageFormatterMethod.java @@ -17,14 +17,6 @@ package org.keycloak.theme.beans; -import static java.util.Optional.ofNullable; - -import freemarker.template.SimpleNumber; -import freemarker.template.SimpleScalar; -import freemarker.template.TemplateMethodModelEx; -import freemarker.template.TemplateModelException; -import org.keycloak.theme.TemplatingUtil; - import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; @@ -32,6 +24,15 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; +import org.keycloak.theme.TemplatingUtil; + +import freemarker.template.SimpleNumber; +import freemarker.template.SimpleScalar; +import freemarker.template.TemplateMethodModelEx; +import freemarker.template.TemplateModelException; + +import static java.util.Optional.ofNullable; + /** * @author Michael Gerber */ diff --git a/services/src/main/java/org/keycloak/theme/freemarker/DefaultFreeMarkerProvider.java b/services/src/main/java/org/keycloak/theme/freemarker/DefaultFreeMarkerProvider.java index 1be2d539a1e..31ea9c0b0f2 100644 --- a/services/src/main/java/org/keycloak/theme/freemarker/DefaultFreeMarkerProvider.java +++ b/services/src/main/java/org/keycloak/theme/freemarker/DefaultFreeMarkerProvider.java @@ -1,13 +1,5 @@ package org.keycloak.theme.freemarker; -import freemarker.cache.URLTemplateLoader; -import freemarker.core.HTMLOutputFormat; -import freemarker.template.Configuration; -import freemarker.template.Template; -import org.keycloak.theme.FreeMarkerException; -import org.keycloak.theme.KeycloakSanitizerMethod; -import org.keycloak.theme.Theme; - import java.io.IOException; import java.io.StringWriter; import java.io.Writer; @@ -15,6 +7,15 @@ import java.net.URL; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.keycloak.theme.FreeMarkerException; +import org.keycloak.theme.KeycloakSanitizerMethod; +import org.keycloak.theme.Theme; + +import freemarker.cache.URLTemplateLoader; +import freemarker.core.HTMLOutputFormat; +import freemarker.template.Configuration; +import freemarker.template.Template; + public class DefaultFreeMarkerProvider implements FreeMarkerProvider { private final ConcurrentHashMap cache; private final KeycloakSanitizerMethod kcSanitizeMethod; diff --git a/services/src/main/java/org/keycloak/theme/freemarker/DefaultFreeMarkerProviderFactory.java b/services/src/main/java/org/keycloak/theme/freemarker/DefaultFreeMarkerProviderFactory.java index 68d691d47bc..541a2dde9e7 100644 --- a/services/src/main/java/org/keycloak/theme/freemarker/DefaultFreeMarkerProviderFactory.java +++ b/services/src/main/java/org/keycloak/theme/freemarker/DefaultFreeMarkerProviderFactory.java @@ -1,12 +1,13 @@ package org.keycloak.theme.freemarker; -import freemarker.template.Template; +import java.util.concurrent.ConcurrentHashMap; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.theme.KeycloakSanitizerMethod; -import java.util.concurrent.ConcurrentHashMap; +import freemarker.template.Template; public class DefaultFreeMarkerProviderFactory implements FreeMarkerProviderFactory { diff --git a/services/src/main/java/org/keycloak/timer/basic/BasicTimerProvider.java b/services/src/main/java/org/keycloak/timer/basic/BasicTimerProvider.java index 517fab44129..6ad43a8913d 100644 --- a/services/src/main/java/org/keycloak/timer/basic/BasicTimerProvider.java +++ b/services/src/main/java/org/keycloak/timer/basic/BasicTimerProvider.java @@ -17,18 +17,19 @@ package org.keycloak.timer.basic; -import org.jboss.logging.Logger; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Timer; +import java.util.TimerTask; + import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; import org.keycloak.services.scheduled.ScheduledTaskRunner; import org.keycloak.timer.ScheduledTask; import org.keycloak.timer.TimerProvider; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Timer; -import java.util.TimerTask; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/timer/basic/BasicTimerProviderFactory.java b/services/src/main/java/org/keycloak/timer/basic/BasicTimerProviderFactory.java index 91e61139d50..eb4ed9570a9 100644 --- a/services/src/main/java/org/keycloak/timer/basic/BasicTimerProviderFactory.java +++ b/services/src/main/java/org/keycloak/timer/basic/BasicTimerProviderFactory.java @@ -17,17 +17,17 @@ package org.keycloak.timer.basic; +import java.util.Map; +import java.util.Timer; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.timer.TimerProvider; import org.keycloak.timer.TimerProviderFactory; -import java.util.Map; -import java.util.Timer; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/transaction/AsyncResponseTransaction.java b/services/src/main/java/org/keycloak/transaction/AsyncResponseTransaction.java index 267a69c81ad..327f0684d4c 100644 --- a/services/src/main/java/org/keycloak/transaction/AsyncResponseTransaction.java +++ b/services/src/main/java/org/keycloak/transaction/AsyncResponseTransaction.java @@ -1,14 +1,14 @@ package org.keycloak.transaction; +import jakarta.ws.rs.container.AsyncResponse; +import jakarta.ws.rs.core.Response; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakTransaction; import org.keycloak.models.KeycloakTransactionManager; import org.keycloak.services.ErrorPage; import org.keycloak.services.messages.Messages; -import jakarta.ws.rs.container.AsyncResponse; -import jakarta.ws.rs.core.Response; - /** * When using {@link AsyncResponse#resume(Object)} directly in the code, the response is returned before all changes * done withing this execution are committed. Therefore we need some mechanism that resumes the AsyncResponse after all diff --git a/services/src/main/java/org/keycloak/transaction/JBossJtaTransactionManagerLookup.java b/services/src/main/java/org/keycloak/transaction/JBossJtaTransactionManagerLookup.java index a53f20dc94a..f16be584132 100644 --- a/services/src/main/java/org/keycloak/transaction/JBossJtaTransactionManagerLookup.java +++ b/services/src/main/java/org/keycloak/transaction/JBossJtaTransactionManagerLookup.java @@ -16,13 +16,15 @@ */ package org.keycloak.transaction; -import org.jboss.logging.Logger; +import javax.naming.InitialContext; +import javax.naming.NamingException; + +import jakarta.transaction.TransactionManager; + import org.keycloak.Config; import org.keycloak.models.KeycloakSessionFactory; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import jakarta.transaction.TransactionManager; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/transaction/JtaTransactionWrapper.java b/services/src/main/java/org/keycloak/transaction/JtaTransactionWrapper.java index 6a4a4a5b23b..c4413d10fa0 100644 --- a/services/src/main/java/org/keycloak/transaction/JtaTransactionWrapper.java +++ b/services/src/main/java/org/keycloak/transaction/JtaTransactionWrapper.java @@ -16,16 +16,18 @@ */ package org.keycloak.transaction; -import org.jboss.logging.Logger; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakTransaction; -import org.keycloak.provider.ExceptionConverter; +import java.util.Objects; import jakarta.transaction.RollbackException; import jakarta.transaction.Status; import jakarta.transaction.Transaction; import jakarta.transaction.TransactionManager; -import java.util.Objects; + +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakTransaction; +import org.keycloak.provider.ExceptionConverter; + +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/services/src/main/java/org/keycloak/transaction/UserTransactionWrapper.java b/services/src/main/java/org/keycloak/transaction/UserTransactionWrapper.java index 941eb436f5c..99f67d458e0 100644 --- a/services/src/main/java/org/keycloak/transaction/UserTransactionWrapper.java +++ b/services/src/main/java/org/keycloak/transaction/UserTransactionWrapper.java @@ -16,11 +16,11 @@ */ package org.keycloak.transaction; -import org.keycloak.models.KeycloakTransaction; - import jakarta.transaction.Status; import jakarta.transaction.UserTransaction; +import org.keycloak.models.KeycloakTransaction; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/truststore/FileTruststoreProvider.java b/services/src/main/java/org/keycloak/truststore/FileTruststoreProvider.java index 70bbaf6d3c3..b38325061fa 100755 --- a/services/src/main/java/org/keycloak/truststore/FileTruststoreProvider.java +++ b/services/src/main/java/org/keycloak/truststore/FileTruststoreProvider.java @@ -17,8 +17,6 @@ package org.keycloak.truststore; -import org.keycloak.common.enums.HostnameVerificationPolicy; - import java.security.KeyStore; import java.security.cert.X509Certificate; import java.util.List; @@ -26,6 +24,8 @@ import java.util.Map; import javax.net.ssl.SSLSocketFactory; import javax.security.auth.x500.X500Principal; +import org.keycloak.common.enums.HostnameVerificationPolicy; + /** * @author Marko Strukelj */ diff --git a/services/src/main/java/org/keycloak/truststore/FileTruststoreProviderFactory.java b/services/src/main/java/org/keycloak/truststore/FileTruststoreProviderFactory.java index 67a077c5c06..2edbcf3f0b6 100755 --- a/services/src/main/java/org/keycloak/truststore/FileTruststoreProviderFactory.java +++ b/services/src/main/java/org/keycloak/truststore/FileTruststoreProviderFactory.java @@ -17,15 +17,6 @@ package org.keycloak.truststore; -import org.jboss.logging.Logger; -import org.keycloak.Config; -import org.keycloak.common.enums.HostnameVerificationPolicy; -import org.keycloak.common.util.KeystoreUtil; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.provider.ProviderConfigurationBuilder; - import java.io.File; import java.security.InvalidKeyException; import java.security.KeyStore; @@ -46,9 +37,18 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; - import javax.security.auth.x500.X500Principal; +import org.keycloak.Config; +import org.keycloak.common.enums.HostnameVerificationPolicy; +import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.provider.ProviderConfigurationBuilder; + +import org.jboss.logging.Logger; + /** * @author Marko Strukelj */ diff --git a/services/src/main/java/org/keycloak/truststore/SSLSocketFactory.java b/services/src/main/java/org/keycloak/truststore/SSLSocketFactory.java index a11fafef7e2..f6ae52e90ed 100755 --- a/services/src/main/java/org/keycloak/truststore/SSLSocketFactory.java +++ b/services/src/main/java/org/keycloak/truststore/SSLSocketFactory.java @@ -17,14 +17,15 @@ package org.keycloak.truststore; -import org.jboss.logging.Logger; -import org.keycloak.common.crypto.CryptoIntegration; - import java.io.IOException; import java.net.InetAddress; import java.net.Socket; import java.util.Comparator; +import org.keycloak.common.crypto.CryptoIntegration; + +import org.jboss.logging.Logger; + /** * Using this class is ugly, but it is the only way to push our truststore to the default LDAP client implementation. diff --git a/services/src/main/java/org/keycloak/truststore/TruststoreBuilder.java b/services/src/main/java/org/keycloak/truststore/TruststoreBuilder.java index af4e011df04..d9554d40986 100644 --- a/services/src/main/java/org/keycloak/truststore/TruststoreBuilder.java +++ b/services/src/main/java/org/keycloak/truststore/TruststoreBuilder.java @@ -17,10 +17,6 @@ package org.keycloak.truststore; -import org.jboss.logging.Logger; -import org.keycloak.common.util.KeystoreUtil; -import org.keycloak.common.util.KeystoreUtil.KeystoreFormat; - import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -35,6 +31,11 @@ import java.util.Collections; import java.util.List; import java.util.stream.Stream; +import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.common.util.KeystoreUtil.KeystoreFormat; + +import org.jboss.logging.Logger; + /** * Builds a system-wide truststore from the given config options. */ diff --git a/services/src/main/java/org/keycloak/url/HostnameV2Provider.java b/services/src/main/java/org/keycloak/url/HostnameV2Provider.java index f5965119f31..b94b6668d0e 100644 --- a/services/src/main/java/org/keycloak/url/HostnameV2Provider.java +++ b/services/src/main/java/org/keycloak/url/HostnameV2Provider.java @@ -17,16 +17,18 @@ package org.keycloak.url; +import java.net.URI; +import java.util.Optional; + import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import org.jboss.logging.Logger; + import org.keycloak.common.enums.SslRequired; import org.keycloak.models.KeycloakSession; import org.keycloak.urls.HostnameProvider; import org.keycloak.urls.UrlType; -import java.net.URI; -import java.util.Optional; +import org.jboss.logging.Logger; import static org.keycloak.common.util.UriUtils.checkUrl; import static org.keycloak.urls.UrlType.FRONTEND; diff --git a/services/src/main/java/org/keycloak/url/HostnameV2ProviderFactory.java b/services/src/main/java/org/keycloak/url/HostnameV2ProviderFactory.java index c6ad03d1578..29c2fe157e4 100644 --- a/services/src/main/java/org/keycloak/url/HostnameV2ProviderFactory.java +++ b/services/src/main/java/org/keycloak/url/HostnameV2ProviderFactory.java @@ -21,7 +21,6 @@ import java.net.URI; import java.util.Arrays; import java.util.Optional; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.models.KeycloakSession; @@ -29,6 +28,8 @@ import org.keycloak.provider.EnvironmentDependentProviderFactory; import org.keycloak.urls.HostnameProvider; import org.keycloak.urls.HostnameProviderFactory; +import org.jboss.logging.Logger; + /** * @author Vaclav Muzikar */ diff --git a/services/src/main/java/org/keycloak/userprofile/DeclarativeUserProfileProvider.java b/services/src/main/java/org/keycloak/userprofile/DeclarativeUserProfileProvider.java index b3e98ab427f..365f1a23ad5 100644 --- a/services/src/main/java/org/keycloak/userprofile/DeclarativeUserProfileProvider.java +++ b/services/src/main/java/org/keycloak/userprofile/DeclarativeUserProfileProvider.java @@ -19,8 +19,6 @@ package org.keycloak.userprofile; -import static org.keycloak.common.util.ObjectUtil.isBlank; -import static org.keycloak.protocol.oidc.TokenManager.getRequestedClientScopes; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -40,15 +38,15 @@ import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import org.keycloak.services.managers.AuthenticationManager; -import org.keycloak.userprofile.config.DeclarativeUserProfileModel; import org.keycloak.representations.userprofile.config.UPAttribute; import org.keycloak.representations.userprofile.config.UPAttributePermissions; import org.keycloak.representations.userprofile.config.UPAttributeRequired; import org.keycloak.representations.userprofile.config.UPAttributeSelector; import org.keycloak.representations.userprofile.config.UPConfig; -import org.keycloak.userprofile.config.UPConfigUtils; import org.keycloak.representations.userprofile.config.UPGroup; +import org.keycloak.services.managers.AuthenticationManager; +import org.keycloak.userprofile.config.DeclarativeUserProfileModel; +import org.keycloak.userprofile.config.UPConfigUtils; import org.keycloak.userprofile.validator.AttributeRequiredByMetadataValidator; import org.keycloak.userprofile.validator.ImmutableAttributeValidator; import org.keycloak.userprofile.validator.MultiValueValidator; @@ -56,6 +54,9 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.validate.AbstractSimpleValidator; import org.keycloak.validate.ValidatorConfig; +import static org.keycloak.common.util.ObjectUtil.isBlank; +import static org.keycloak.protocol.oidc.TokenManager.getRequestedClientScopes; + /** * {@link UserProfileProvider} loading configuration from the changeable JSON file stored in component config. Parsed * configuration is cached. diff --git a/services/src/main/java/org/keycloak/userprofile/DeclarativeUserProfileProviderFactory.java b/services/src/main/java/org/keycloak/userprofile/DeclarativeUserProfileProviderFactory.java index 1bb7e0eada0..962063f6c7c 100644 --- a/services/src/main/java/org/keycloak/userprofile/DeclarativeUserProfileProviderFactory.java +++ b/services/src/main/java/org/keycloak/userprofile/DeclarativeUserProfileProviderFactory.java @@ -72,6 +72,7 @@ import org.keycloak.validate.ValidatorConfig; import org.keycloak.validate.validators.EmailValidator; import static java.util.Optional.ofNullable; + import static org.keycloak.common.util.ObjectUtil.isBlank; import static org.keycloak.userprofile.DefaultAttributes.READ_ONLY_ATTRIBUTE_KEY; import static org.keycloak.userprofile.UserProfileContext.ACCOUNT; diff --git a/services/src/main/java/org/keycloak/userprofile/config/UPConfigUtils.java b/services/src/main/java/org/keycloak/userprofile/config/UPConfigUtils.java index 2f0e4c85351..bdd175c360a 100644 --- a/services/src/main/java/org/keycloak/userprofile/config/UPConfigUtils.java +++ b/services/src/main/java/org/keycloak/userprofile/config/UPConfigUtils.java @@ -16,9 +16,6 @@ */ package org.keycloak.userprofile.config; -import static org.keycloak.common.util.ObjectUtil.isBlank; -import static org.keycloak.userprofile.UserProfileUtil.isRootAttribute; - import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.IOException; @@ -51,6 +48,9 @@ import org.keycloak.validate.ValidationResult; import org.keycloak.validate.ValidatorConfig; import org.keycloak.validate.Validators; +import static org.keycloak.common.util.ObjectUtil.isBlank; +import static org.keycloak.userprofile.UserProfileUtil.isRootAttribute; + /** * Utility methods to work with User Profile Configurations * diff --git a/services/src/main/java/org/keycloak/userprofile/validator/DuplicateEmailValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/DuplicateEmailValidator.java index 469f0404c90..6c6832db87b 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/DuplicateEmailValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/DuplicateEmailValidator.java @@ -16,10 +16,11 @@ */ package org.keycloak.userprofile.validator; -import jakarta.ws.rs.core.Response; import java.util.List; import java.util.Objects; +import jakarta.ws.rs.core.Response; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; diff --git a/services/src/main/java/org/keycloak/userprofile/validator/DuplicateUsernameValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/DuplicateUsernameValidator.java index 6f1c4eb03e6..d622b3342b5 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/DuplicateUsernameValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/DuplicateUsernameValidator.java @@ -16,9 +16,10 @@ */ package org.keycloak.userprofile.validator; -import jakarta.ws.rs.core.Response; import java.util.List; +import jakarta.ws.rs.core.Response; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; diff --git a/services/src/main/java/org/keycloak/userprofile/validator/EmailExistsAsUsernameValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/EmailExistsAsUsernameValidator.java index b73c3369b81..af018cc38c4 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/EmailExistsAsUsernameValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/EmailExistsAsUsernameValidator.java @@ -16,9 +16,10 @@ */ package org.keycloak.userprofile.validator; -import jakarta.ws.rs.core.Response; import java.util.List; +import jakarta.ws.rs.core.Response; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; diff --git a/services/src/main/java/org/keycloak/userprofile/validator/ImmutableAttributeValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/ImmutableAttributeValidator.java index fb5cb1ec574..b6b21bdba13 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/ImmutableAttributeValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/ImmutableAttributeValidator.java @@ -16,9 +16,6 @@ */ package org.keycloak.userprofile.validator; -import static org.keycloak.common.util.CollectionUtil.collectionEquals; -import static org.keycloak.validate.BuiltinValidators.notBlankValidator; - import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -33,6 +30,9 @@ import org.keycloak.validate.ValidationContext; import org.keycloak.validate.ValidationError; import org.keycloak.validate.ValidatorConfig; +import static org.keycloak.common.util.CollectionUtil.collectionEquals; +import static org.keycloak.validate.BuiltinValidators.notBlankValidator; + /** * A validator that fails when the attribute is marked as read only and its value has changed. * diff --git a/services/src/main/java/org/keycloak/userprofile/validator/MultiValueValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/MultiValueValidator.java index 5ee11823e20..367d603e913 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/MultiValueValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/MultiValueValidator.java @@ -16,9 +16,6 @@ */ package org.keycloak.userprofile.validator; -import static org.keycloak.validate.validators.ValidatorConfigValidator.MESSAGE_CONFIG_INVALID_NUMBER_VALUE; -import static org.keycloak.validate.validators.ValidatorConfigValidator.MESSAGE_CONFIG_MISSING_VALUE; - import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; @@ -40,6 +37,9 @@ import org.keycloak.validate.ValidationResult; import org.keycloak.validate.ValidatorConfig; import org.keycloak.validate.validators.ValidatorConfigValidator; +import static org.keycloak.validate.validators.ValidatorConfigValidator.MESSAGE_CONFIG_INVALID_NUMBER_VALUE; +import static org.keycloak.validate.validators.ValidatorConfigValidator.MESSAGE_CONFIG_MISSING_VALUE; + public class MultiValueValidator implements SimpleValidator, ConfiguredProvider { public static final String ID = "multivalued"; diff --git a/services/src/main/java/org/keycloak/userprofile/validator/ReadOnlyAttributeUnchangedValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/ReadOnlyAttributeUnchangedValidator.java index f18cc4be8b4..50de940baf8 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/ReadOnlyAttributeUnchangedValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/ReadOnlyAttributeUnchangedValidator.java @@ -16,13 +16,10 @@ */ package org.keycloak.userprofile.validator; -import static org.keycloak.common.util.ObjectUtil.isBlank; - import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import org.jboss.logging.Logger; import org.keycloak.common.util.ObjectUtil; import org.keycloak.models.UserModel; import org.keycloak.userprofile.AttributeContext; @@ -32,6 +29,10 @@ import org.keycloak.validate.ValidationContext; import org.keycloak.validate.ValidationError; import org.keycloak.validate.ValidatorConfig; +import org.jboss.logging.Logger; + +import static org.keycloak.common.util.ObjectUtil.isBlank; + /** * Validator to check that User Profile attribute value is not changed if attribute is read-only. Expects List of * Strings as input. diff --git a/services/src/main/java/org/keycloak/userprofile/validator/RegistrationUsernameExistsValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/RegistrationUsernameExistsValidator.java index f4989b5f323..77d83a416e2 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/RegistrationUsernameExistsValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/RegistrationUsernameExistsValidator.java @@ -16,9 +16,10 @@ */ package org.keycloak.userprofile.validator; -import jakarta.ws.rs.core.Response; import java.util.List; +import jakarta.ws.rs.core.Response; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; diff --git a/services/src/main/java/org/keycloak/userprofile/validator/UsernameIDNHomographValidator.java b/services/src/main/java/org/keycloak/userprofile/validator/UsernameIDNHomographValidator.java index c1e850e852e..622a6c5adcd 100644 --- a/services/src/main/java/org/keycloak/userprofile/validator/UsernameIDNHomographValidator.java +++ b/services/src/main/java/org/keycloak/userprofile/validator/UsernameIDNHomographValidator.java @@ -16,6 +16,9 @@ */ package org.keycloak.userprofile.validator; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.provider.ConfiguredProvider; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.services.validation.Validation; @@ -24,9 +27,6 @@ import org.keycloak.validate.ValidationContext; import org.keycloak.validate.ValidationError; import org.keycloak.validate.ValidatorConfig; -import java.util.ArrayList; -import java.util.List; - /** * Validator to check that User Profile username is provided. Expects List of Strings as input. * diff --git a/services/src/main/java/org/keycloak/utils/BrokerUtil.java b/services/src/main/java/org/keycloak/utils/BrokerUtil.java index 05b947074d1..e2fad39e964 100644 --- a/services/src/main/java/org/keycloak/utils/BrokerUtil.java +++ b/services/src/main/java/org/keycloak/utils/BrokerUtil.java @@ -26,6 +26,7 @@ import java.security.NoSuchAlgorithmException; import java.util.UUID; import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.common.util.Base64Url; import org.keycloak.representations.account.AccountLinkUriRepresentation; import org.keycloak.services.Urls; diff --git a/services/src/main/java/org/keycloak/utils/CRLUtils.java b/services/src/main/java/org/keycloak/utils/CRLUtils.java index 466b11df08f..3dbd8e5dee5 100644 --- a/services/src/main/java/org/keycloak/utils/CRLUtils.java +++ b/services/src/main/java/org/keycloak/utils/CRLUtils.java @@ -27,13 +27,13 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; - import javax.security.auth.x500.X500Principal; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.truststore.TruststoreProvider; +import org.jboss.logging.Logger; + /** * @author Peter Nalyvayko * @version $Revision: 1 $ diff --git a/services/src/main/java/org/keycloak/utils/OAuth2Error.java b/services/src/main/java/org/keycloak/utils/OAuth2Error.java index c690a65279a..8958120210f 100644 --- a/services/src/main/java/org/keycloak/utils/OAuth2Error.java +++ b/services/src/main/java/org/keycloak/utils/OAuth2Error.java @@ -28,6 +28,7 @@ import java.util.Map; import java.util.Optional; import java.util.function.BiConsumer; import java.util.stream.Collectors; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.InternalServerErrorException; @@ -43,6 +44,7 @@ import org.keycloak.services.cors.Cors; import org.keycloak.services.util.DPoPUtil; import static jakarta.ws.rs.core.HttpHeaders.WWW_AUTHENTICATE; + import static org.keycloak.OAuth2Constants.ALGS_ATTRIBUTE; import static org.keycloak.services.util.DPoPUtil.DPOP_SCHEME; diff --git a/services/src/main/java/org/keycloak/utils/ProfileHelper.java b/services/src/main/java/org/keycloak/utils/ProfileHelper.java index 5adf373440a..ef4f43e595e 100644 --- a/services/src/main/java/org/keycloak/utils/ProfileHelper.java +++ b/services/src/main/java/org/keycloak/utils/ProfileHelper.java @@ -17,11 +17,11 @@ package org.keycloak.utils; -import org.keycloak.common.Profile; - import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; +import org.keycloak.common.Profile; + /** * @author Stian Thorgersen */ diff --git a/services/src/main/java/org/keycloak/utils/SMTPUtil.java b/services/src/main/java/org/keycloak/utils/SMTPUtil.java index a2bc06226fc..5262fb3a433 100644 --- a/services/src/main/java/org/keycloak/utils/SMTPUtil.java +++ b/services/src/main/java/org/keycloak/utils/SMTPUtil.java @@ -19,6 +19,7 @@ package org.keycloak.utils; import java.net.IDN; import java.util.Map; + import org.keycloak.email.EmailException; import org.keycloak.email.EmailSenderProvider; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/utils/SecureContextResolver.java b/services/src/main/java/org/keycloak/utils/SecureContextResolver.java index 93c104c83ee..69b0563d0b2 100644 --- a/services/src/main/java/org/keycloak/utils/SecureContextResolver.java +++ b/services/src/main/java/org/keycloak/utils/SecureContextResolver.java @@ -1,16 +1,16 @@ package org.keycloak.utils; +import java.net.InetAddress; +import java.net.URI; +import java.net.UnknownHostException; +import java.util.function.Supplier; + import org.keycloak.device.DeviceRepresentationProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.account.DeviceRepresentation; import io.netty.util.NetUtil; -import java.net.InetAddress; -import java.net.URI; -import java.net.UnknownHostException; -import java.util.function.Supplier; - public class SecureContextResolver { /** diff --git a/services/src/main/java/org/keycloak/utils/ServicesUtils.java b/services/src/main/java/org/keycloak/utils/ServicesUtils.java index b6887188275..a2ad3843a1e 100644 --- a/services/src/main/java/org/keycloak/utils/ServicesUtils.java +++ b/services/src/main/java/org/keycloak/utils/ServicesUtils.java @@ -17,16 +17,17 @@ package org.keycloak.utils; -import org.jboss.logging.Logger; -import org.keycloak.executors.ExecutorsProvider; -import org.keycloak.models.KeycloakSession; - import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Stream; +import org.keycloak.executors.ExecutorsProvider; +import org.keycloak.models.KeycloakSession; + +import org.jboss.logging.Logger; + import static org.keycloak.common.util.StackUtil.getShortStackTrace; /** diff --git a/services/src/main/java/org/keycloak/utils/TotpUtils.java b/services/src/main/java/org/keycloak/utils/TotpUtils.java index c834bb1e60a..cf93f88885a 100644 --- a/services/src/main/java/org/keycloak/utils/TotpUtils.java +++ b/services/src/main/java/org/keycloak/utils/TotpUtils.java @@ -17,16 +17,17 @@ package org.keycloak.utils; -import com.google.zxing.BarcodeFormat; -import com.google.zxing.client.j2se.MatrixToImageWriter; -import com.google.zxing.common.BitMatrix; -import com.google.zxing.qrcode.QRCodeWriter; +import java.io.ByteArrayOutputStream; +import java.util.Base64; + import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.utils.Base32; -import java.io.ByteArrayOutputStream; -import java.util.Base64; +import com.google.zxing.BarcodeFormat; +import com.google.zxing.client.j2se.MatrixToImageWriter; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.qrcode.QRCodeWriter; /** * @author Stian Thorgersen diff --git a/services/src/main/java/org/keycloak/validation/DefaultClientValidationProvider.java b/services/src/main/java/org/keycloak/validation/DefaultClientValidationProvider.java index 7899bc3cbe8..79209630ec1 100644 --- a/services/src/main/java/org/keycloak/validation/DefaultClientValidationProvider.java +++ b/services/src/main/java/org/keycloak/validation/DefaultClientValidationProvider.java @@ -16,6 +16,16 @@ */ package org.keycloak.validation; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayDeque; +import java.util.Deque; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.keycloak.authentication.authenticators.util.LoAUtil; import org.keycloak.models.ClientModel; import org.keycloak.protocol.ProtocolMapperConfigException; @@ -34,17 +44,6 @@ import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.services.util.ResolveRelative; import org.keycloak.utils.StringUtil; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; - -import java.util.ArrayDeque; -import java.util.Deque; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import static org.keycloak.models.utils.ModelToRepresentation.toRepresentation; public class DefaultClientValidationProvider implements ClientValidationProvider { diff --git a/services/src/main/java/org/keycloak/vault/AbstractVaultProvider.java b/services/src/main/java/org/keycloak/vault/AbstractVaultProvider.java index 8f234b10599..e2e056aebb3 100644 --- a/services/src/main/java/org/keycloak/vault/AbstractVaultProvider.java +++ b/services/src/main/java/org/keycloak/vault/AbstractVaultProvider.java @@ -17,13 +17,13 @@ package org.keycloak.vault; -import org.jboss.logging.Logger; - import java.io.File; import java.lang.invoke.MethodHandles; import java.util.List; import java.util.Optional; +import org.jboss.logging.Logger; + /** * Abstract class that is meant to be extended by implementations of {@link VaultProvider} that want to have support for * key resolvers. diff --git a/services/src/main/java/org/keycloak/vault/AbstractVaultProviderFactory.java b/services/src/main/java/org/keycloak/vault/AbstractVaultProviderFactory.java index 6d407d34add..884b53b294b 100644 --- a/services/src/main/java/org/keycloak/vault/AbstractVaultProviderFactory.java +++ b/services/src/main/java/org/keycloak/vault/AbstractVaultProviderFactory.java @@ -22,10 +22,11 @@ import java.lang.invoke.MethodHandles; import java.util.LinkedList; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.models.KeycloakSession; +import org.jboss.logging.Logger; + /** * Abstract class that is meant to be extended by implementations of {@link VaultProviderFactory} that want to offer support * for the configuration of key resolvers. diff --git a/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProvider.java b/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProvider.java index f182b6b1d84..87bc7ab9522 100644 --- a/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProvider.java +++ b/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProvider.java @@ -1,12 +1,8 @@ package org.keycloak.vault; -import java.nio.ByteBuffer; - -import org.jboss.logging.Logger; - -import jakarta.annotation.Nonnull; import java.io.IOException; import java.lang.invoke.MethodHandles; +import java.nio.ByteBuffer; import java.nio.file.Files; import java.nio.file.Path; import java.security.Key; @@ -18,6 +14,10 @@ import java.security.cert.CertificateException; import java.util.List; import java.util.Optional; +import jakarta.annotation.Nonnull; + +import org.jboss.logging.Logger; + public class FilesKeystoreVaultProvider extends AbstractVaultProvider { private static final Logger logger = Logger.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProviderFactory.java b/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProviderFactory.java index f1b9d9f3108..106c2440c4b 100644 --- a/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProviderFactory.java +++ b/services/src/main/java/org/keycloak/vault/FilesKeystoreVaultProviderFactory.java @@ -1,15 +1,16 @@ package org.keycloak.vault; -import org.jboss.logging.Logger; -import org.keycloak.Config; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; - import java.lang.invoke.MethodHandles; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import org.keycloak.Config; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; + +import org.jboss.logging.Logger; + public class FilesKeystoreVaultProviderFactory extends AbstractVaultProviderFactory { private static final Logger logger = Logger.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProvider.java b/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProvider.java index e4531243187..8f24948980b 100644 --- a/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProvider.java +++ b/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProvider.java @@ -1,8 +1,5 @@ package org.keycloak.vault; -import org.jboss.logging.Logger; - -import jakarta.annotation.Nonnull; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.nio.ByteBuffer; @@ -11,6 +8,10 @@ import java.nio.file.Path; import java.util.List; import java.util.Optional; +import jakarta.annotation.Nonnull; + +import org.jboss.logging.Logger; + /** * A text-based vault provider, which stores each secret in a separate file. The file name needs to match a vault secret id (or * a key for short) and follows the format provided by the configured {@link VaultKeyResolver}. A typical vault directory diff --git a/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProviderFactory.java b/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProviderFactory.java index 0c0f82e1b13..9b15bdae8f3 100644 --- a/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProviderFactory.java +++ b/services/src/main/java/org/keycloak/vault/FilesPlainTextVaultProviderFactory.java @@ -1,15 +1,16 @@ package org.keycloak.vault; -import org.jboss.logging.Logger; -import org.keycloak.Config; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; - import java.lang.invoke.MethodHandles; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import org.keycloak.Config; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; + +import org.jboss.logging.Logger; + /** * Creates and configures {@link FilesPlainTextVaultProvider}. * diff --git a/services/src/main/java/org/keycloak/workflow/admin/resource/WorkflowResource.java b/services/src/main/java/org/keycloak/workflow/admin/resource/WorkflowResource.java index 43d63f011b2..1ae1951e80d 100644 --- a/services/src/main/java/org/keycloak/workflow/admin/resource/WorkflowResource.java +++ b/services/src/main/java/org/keycloak/workflow/admin/resource/WorkflowResource.java @@ -1,6 +1,5 @@ package org.keycloak.workflow.admin.resource; -import com.fasterxml.jackson.jakarta.rs.yaml.YAMLMediaTypes; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -12,6 +11,7 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.models.ModelException; import org.keycloak.models.workflow.ResourceType; import org.keycloak.models.workflow.Workflow; @@ -19,6 +19,8 @@ import org.keycloak.models.workflow.WorkflowProvider; import org.keycloak.representations.workflows.WorkflowRepresentation; import org.keycloak.services.ErrorResponse; +import com.fasterxml.jackson.jakarta.rs.yaml.YAMLMediaTypes; + public class WorkflowResource { private final WorkflowProvider provider; diff --git a/services/src/main/java/org/keycloak/workflow/admin/resource/WorkflowsResource.java b/services/src/main/java/org/keycloak/workflow/admin/resource/WorkflowsResource.java index 63467b832e7..944929c2d7f 100644 --- a/services/src/main/java/org/keycloak/workflow/admin/resource/WorkflowsResource.java +++ b/services/src/main/java/org/keycloak/workflow/admin/resource/WorkflowsResource.java @@ -3,7 +3,6 @@ package org.keycloak.workflow.admin.resource; import java.util.List; import java.util.Optional; -import com.fasterxml.jackson.jakarta.rs.yaml.YAMLMediaTypes; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; @@ -15,7 +14,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; + import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; import org.keycloak.models.KeycloakSession; @@ -27,6 +26,9 @@ import org.keycloak.representations.workflows.WorkflowSetRepresentation; import org.keycloak.services.ErrorResponse; import org.keycloak.services.resources.admin.fgap.AdminPermissionEvaluator; +import com.fasterxml.jackson.jakarta.rs.yaml.YAMLMediaTypes; +import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; + public class WorkflowsResource { private final KeycloakSession session; diff --git a/services/src/test/java/org/keycloak/authentication/authenticators/x509/CertificateValidatorTest.java b/services/src/test/java/org/keycloak/authentication/authenticators/x509/CertificateValidatorTest.java index 696878c0194..727400670ea 100644 --- a/services/src/test/java/org/keycloak/authentication/authenticators/x509/CertificateValidatorTest.java +++ b/services/src/test/java/org/keycloak/authentication/authenticators/x509/CertificateValidatorTest.java @@ -1,20 +1,21 @@ package org.keycloak.authentication.authenticators.x509; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.crypto.KeyType; -import org.keycloak.rule.CryptoInitRule; - import java.security.GeneralSecurityException; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.cert.X509Certificate; import java.util.Date; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.crypto.KeyType; +import org.keycloak.rule.CryptoInitRule; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Test; + import static org.keycloak.authentication.authenticators.x509.AbstractX509ClientCertificateAuthenticator.CERTIFICATE_POLICY_MODE_ALL; import static org.keycloak.authentication.authenticators.x509.AbstractX509ClientCertificateAuthenticator.CERTIFICATE_POLICY_MODE_ANY; diff --git a/services/src/test/java/org/keycloak/cache/ComputedKeyTest.java b/services/src/test/java/org/keycloak/cache/ComputedKeyTest.java index 4347b425e1b..4618a022a57 100644 --- a/services/src/test/java/org/keycloak/cache/ComputedKeyTest.java +++ b/services/src/test/java/org/keycloak/cache/ComputedKeyTest.java @@ -1,10 +1,10 @@ package org.keycloak.cache; +import java.util.Map; + import org.junit.Test; import org.junit.jupiter.api.Assertions; -import java.util.Map; - public class ComputedKeyTest { @Test diff --git a/services/src/test/java/org/keycloak/compatibility/FeatureCompatibilityMetadataProviderTest.java b/services/src/test/java/org/keycloak/compatibility/FeatureCompatibilityMetadataProviderTest.java index 7ede143871a..6ab888b50f8 100644 --- a/services/src/test/java/org/keycloak/compatibility/FeatureCompatibilityMetadataProviderTest.java +++ b/services/src/test/java/org/keycloak/compatibility/FeatureCompatibilityMetadataProviderTest.java @@ -1,7 +1,5 @@ package org.keycloak.compatibility; -import static org.junit.jupiter.api.Assertions.assertEquals; - import java.lang.reflect.Field; import java.util.Arrays; import java.util.HashMap; @@ -10,13 +8,16 @@ import java.util.Map; import java.util.Set; import java.util.stream.Stream; +import org.keycloak.common.Profile; +import org.keycloak.common.profile.ProfileConfigResolver; + import org.infinispan.commons.util.ReflectionUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.keycloak.common.Profile; -import org.keycloak.common.profile.ProfileConfigResolver; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class FeatureCompatibilityMetadataProviderTest extends AbstractCompatibilityMetadataProviderTest { diff --git a/services/src/test/java/org/keycloak/compatibility/KeycloakCompatibilityMetadataProviderTest.java b/services/src/test/java/org/keycloak/compatibility/KeycloakCompatibilityMetadataProviderTest.java index b687e2b6dd2..4c205712176 100644 --- a/services/src/test/java/org/keycloak/compatibility/KeycloakCompatibilityMetadataProviderTest.java +++ b/services/src/test/java/org/keycloak/compatibility/KeycloakCompatibilityMetadataProviderTest.java @@ -1,13 +1,14 @@ package org.keycloak.compatibility; -import static org.keycloak.compatibility.KeycloakCompatibilityMetadataProvider.VERSION_KEY; - import java.util.Map; -import org.junit.Test; import org.keycloak.common.Profile; import org.keycloak.common.profile.ProfileConfigResolver; +import org.junit.Test; + +import static org.keycloak.compatibility.KeycloakCompatibilityMetadataProvider.VERSION_KEY; + public class KeycloakCompatibilityMetadataProviderTest extends AbstractCompatibilityMetadataProviderTest { @Test diff --git a/services/src/test/java/org/keycloak/connections/httpclient/DefaultHttpClientFactoryTest.java b/services/src/test/java/org/keycloak/connections/httpclient/DefaultHttpClientFactoryTest.java index 19c2e9a1944..91b2358989e 100644 --- a/services/src/test/java/org/keycloak/connections/httpclient/DefaultHttpClientFactoryTest.java +++ b/services/src/test/java/org/keycloak/connections/httpclient/DefaultHttpClientFactoryTest.java @@ -17,27 +17,27 @@ package org.keycloak.connections.httpclient; -import static org.junit.Assert.assertEquals; - import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.HashMap; import java.util.Map; import java.util.Optional; - import javax.net.ssl.SSLPeerUnverifiedException; +import org.keycloak.models.KeycloakSession; +import org.keycloak.services.resteasy.ResteasyKeycloakSession; +import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; +import org.keycloak.utils.ScopeUtil; + import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.junit.Assume; import org.junit.Test; -import org.keycloak.models.KeycloakSession; -import org.keycloak.services.resteasy.ResteasyKeycloakSession; -import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; -import org.keycloak.utils.ScopeUtil; + +import static org.junit.Assert.assertEquals; public class DefaultHttpClientFactoryTest { private static final String DISABLE_TRUST_MANAGER_PROPERTY = "disable-trust-manager"; diff --git a/services/src/test/java/org/keycloak/connections/httpclient/HttpClientBuilderTest.java b/services/src/test/java/org/keycloak/connections/httpclient/HttpClientBuilderTest.java index f5c28193c5e..b1b094b6285 100644 --- a/services/src/test/java/org/keycloak/connections/httpclient/HttpClientBuilderTest.java +++ b/services/src/test/java/org/keycloak/connections/httpclient/HttpClientBuilderTest.java @@ -1,13 +1,13 @@ package org.keycloak.connections.httpclient; +import java.lang.reflect.Field; +import java.util.concurrent.TimeUnit; + import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.CloseableHttpClient; import org.junit.Assert; import org.junit.Test; -import java.lang.reflect.Field; -import java.util.concurrent.TimeUnit; - public class HttpClientBuilderTest { @Test diff --git a/services/src/test/java/org/keycloak/connections/httpclient/ProxyMappingsTest.java b/services/src/test/java/org/keycloak/connections/httpclient/ProxyMappingsTest.java index 7b191aa03f2..453a2824ad6 100644 --- a/services/src/test/java/org/keycloak/connections/httpclient/ProxyMappingsTest.java +++ b/services/src/test/java/org/keycloak/connections/httpclient/ProxyMappingsTest.java @@ -16,22 +16,23 @@ */ package org.keycloak.connections.httpclient; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.keycloak.connections.httpclient.ProxyMappings.ProxyMapping; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.keycloak.connections.httpclient.ProxyMappings.ProxyMapping; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; /** * Tests for {@link ProxyMappings}. diff --git a/services/src/test/java/org/keycloak/connections/httpclient/SafeBasicResponseHandlerTest.java b/services/src/test/java/org/keycloak/connections/httpclient/SafeBasicResponseHandlerTest.java index f006d1e9fa0..bb68c3b4401 100644 --- a/services/src/test/java/org/keycloak/connections/httpclient/SafeBasicResponseHandlerTest.java +++ b/services/src/test/java/org/keycloak/connections/httpclient/SafeBasicResponseHandlerTest.java @@ -17,6 +17,11 @@ package org.keycloak.connections.httpclient; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.util.concurrent.atomic.AtomicBoolean; + import org.apache.http.HttpEntity; import org.apache.http.entity.StringEntity; import org.hamcrest.MatcherAssert; @@ -24,11 +29,6 @@ import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Test; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.util.concurrent.atomic.AtomicBoolean; - /** * @author Alexander Schwartz */ diff --git a/services/src/test/java/org/keycloak/events/log/JBossLoggingEventListenerProviderTest.java b/services/src/test/java/org/keycloak/events/log/JBossLoggingEventListenerProviderTest.java index 47ad24b9497..5fe2a5eb925 100644 --- a/services/src/test/java/org/keycloak/events/log/JBossLoggingEventListenerProviderTest.java +++ b/services/src/test/java/org/keycloak/events/log/JBossLoggingEventListenerProviderTest.java @@ -24,13 +24,7 @@ import java.util.Map; import java.util.function.Consumer; import java.util.logging.Handler; import java.util.logging.Level; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.logmanager.Logger; -import org.jboss.logmanager.formatters.PatternFormatter; -import org.jboss.logmanager.handlers.WriterHandler; -import org.jboss.resteasy.mock.MockHttpRequest; -import org.junit.Test; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.common.crypto.CryptoIntegration; @@ -47,6 +41,14 @@ import org.keycloak.services.resteasy.ResteasyKeycloakSession; import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; import org.keycloak.utils.ScopeUtil; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.logmanager.Logger; +import org.jboss.logmanager.formatters.PatternFormatter; +import org.jboss.logmanager.handlers.WriterHandler; +import org.jboss.resteasy.mock.MockHttpRequest; +import org.junit.Test; + /** * * @author rmartinc diff --git a/services/src/test/java/org/keycloak/exportimport/ExportImportManagerTest.java b/services/src/test/java/org/keycloak/exportimport/ExportImportManagerTest.java index ee87a326d73..2a45d14ae8a 100644 --- a/services/src/test/java/org/keycloak/exportimport/ExportImportManagerTest.java +++ b/services/src/test/java/org/keycloak/exportimport/ExportImportManagerTest.java @@ -1,20 +1,21 @@ package org.keycloak.exportimport; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.io.IOException; -import org.junit.After; -import org.junit.Test; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.Provider; import org.keycloak.services.DefaultKeycloakContext; import org.keycloak.services.DefaultKeycloakSession; import org.keycloak.services.DefaultKeycloakSessionFactory; +import org.junit.After; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class ExportImportManagerTest { @After diff --git a/services/src/test/java/org/keycloak/forms/login/freemarker/model/LoginRealmBeanTest.java b/services/src/test/java/org/keycloak/forms/login/freemarker/model/LoginRealmBeanTest.java index 4cc757c659a..a123403e330 100644 --- a/services/src/test/java/org/keycloak/forms/login/freemarker/model/LoginRealmBeanTest.java +++ b/services/src/test/java/org/keycloak/forms/login/freemarker/model/LoginRealmBeanTest.java @@ -17,11 +17,12 @@ package org.keycloak.forms.login.freemarker.model; -import org.junit.Assert; -import org.junit.Test; +import java.lang.reflect.Proxy; + import org.keycloak.models.RealmModel; -import java.lang.reflect.Proxy; +import org.junit.Assert; +import org.junit.Test; public class LoginRealmBeanTest { diff --git a/services/src/test/java/org/keycloak/jose/jwk/ServerJWKTest.java b/services/src/test/java/org/keycloak/jose/jwk/ServerJWKTest.java index 5420cf72db5..b1247c51b64 100644 --- a/services/src/test/java/org/keycloak/jose/jwk/ServerJWKTest.java +++ b/services/src/test/java/org/keycloak/jose/jwk/ServerJWKTest.java @@ -17,11 +17,6 @@ package org.keycloak.jose.jwk; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.nio.charset.StandardCharsets; import java.security.KeyPair; import java.security.KeyPairGenerator; @@ -29,14 +24,20 @@ import java.security.PrivateKey; import java.security.PublicKey; import java.security.Signature; -import org.junit.ClassRule; -import org.junit.Test; import org.keycloak.common.util.KeyUtils; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.JavaAlgorithm; import org.keycloak.rule.CryptoInitRule; import org.keycloak.util.JsonSerialization; +import org.junit.ClassRule; +import org.junit.Test; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * This is not tested in keycloak-core. The subclasses should be created in the crypto modules to make sure it is tested with corresponding modules (bouncycastle VS bouncycastle-fips) * diff --git a/services/src/test/java/org/keycloak/locale/DefaultLocaleSelectorProviderTest.java b/services/src/test/java/org/keycloak/locale/DefaultLocaleSelectorProviderTest.java index 8a4c14ce30c..08ae629ad39 100644 --- a/services/src/test/java/org/keycloak/locale/DefaultLocaleSelectorProviderTest.java +++ b/services/src/test/java/org/keycloak/locale/DefaultLocaleSelectorProviderTest.java @@ -1,14 +1,14 @@ package org.keycloak.locale; +import java.util.Arrays; +import java.util.Locale; + +import org.junit.Test; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; - -import java.util.Arrays; -import java.util.Locale; - public class DefaultLocaleSelectorProviderTest { private static final Locale LOCALE_DE_CH = Locale.forLanguageTag("de-CH"); diff --git a/services/src/test/java/org/keycloak/procotol/docker/installation/DockerComposeYamlInstallationProviderTest.java b/services/src/test/java/org/keycloak/procotol/docker/installation/DockerComposeYamlInstallationProviderTest.java index 9d271d88326..75eb42a2ec9 100644 --- a/services/src/test/java/org/keycloak/procotol/docker/installation/DockerComposeYamlInstallationProviderTest.java +++ b/services/src/test/java/org/keycloak/procotol/docker/installation/DockerComposeYamlInstallationProviderTest.java @@ -1,12 +1,5 @@ package org.keycloak.procotol.docker.installation; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.IsEqual.equalTo; -import static org.hamcrest.core.IsNull.notNullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.keycloak.protocol.docker.installation.DockerComposeYamlInstallationProvider.ROOT_DIR; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -28,11 +21,6 @@ import java.util.zip.ZipOutputStream; import jakarta.ws.rs.core.Response; -import org.apache.commons.io.FileUtils; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Ignore; -import org.junit.Test; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.util.CertificateUtils; import org.keycloak.common.util.PemUtils; @@ -40,6 +28,20 @@ import org.keycloak.crypto.KeyType; import org.keycloak.protocol.docker.installation.DockerComposeYamlInstallationProvider; import org.keycloak.rule.CryptoInitRule; +import org.apache.commons.io.FileUtils; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Ignore; +import org.junit.Test; + +import static org.keycloak.protocol.docker.installation.DockerComposeYamlInstallationProvider.ROOT_DIR; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + public class DockerComposeYamlInstallationProviderTest { @ClassRule diff --git a/services/src/test/java/org/keycloak/procotol/docker/installation/DockerKeyIdentifierTest.java b/services/src/test/java/org/keycloak/procotol/docker/installation/DockerKeyIdentifierTest.java index e62c0063003..b6feee57404 100644 --- a/services/src/test/java/org/keycloak/procotol/docker/installation/DockerKeyIdentifierTest.java +++ b/services/src/test/java/org/keycloak/procotol/docker/installation/DockerKeyIdentifierTest.java @@ -1,14 +1,15 @@ package org.keycloak.procotol.docker.installation; -import org.junit.Before; -import org.junit.Test; -import org.keycloak.protocol.docker.DockerKeyIdentifier; - import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.PublicKey; import java.security.SecureRandom; +import org.keycloak.protocol.docker.DockerKeyIdentifier; + +import org.junit.Before; +import org.junit.Test; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/services/src/test/java/org/keycloak/protocol/ProtocolFactoryTest.java b/services/src/test/java/org/keycloak/protocol/ProtocolFactoryTest.java index b6de16cc3fd..aa8df620a6b 100644 --- a/services/src/test/java/org/keycloak/protocol/ProtocolFactoryTest.java +++ b/services/src/test/java/org/keycloak/protocol/ProtocolFactoryTest.java @@ -18,17 +18,18 @@ package org.keycloak.protocol; -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.protocol.oid4vc.OID4VCLoginProtocolFactory; -import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory; -import org.keycloak.protocol.saml.SamlProtocolFactory; - import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; import java.util.ServiceLoader; +import org.keycloak.protocol.oid4vc.OID4VCLoginProtocolFactory; +import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory; +import org.keycloak.protocol.saml.SamlProtocolFactory; + +import org.junit.Assert; +import org.junit.Test; + /** * @author Pascal Knüppel */ diff --git a/services/src/test/java/org/keycloak/protocol/ProtocolMapperUtilsTest.java b/services/src/test/java/org/keycloak/protocol/ProtocolMapperUtilsTest.java index 51c9787395f..d2b95c959ce 100644 --- a/services/src/test/java/org/keycloak/protocol/ProtocolMapperUtilsTest.java +++ b/services/src/test/java/org/keycloak/protocol/ProtocolMapperUtilsTest.java @@ -17,11 +17,12 @@ package org.keycloak.protocol; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.models.UserModel; import org.keycloak.models.utils.UserModelDelegate; +import org.junit.Assert; +import org.junit.Test; + /** * @author Alexander Schwartz */ diff --git a/services/src/test/java/org/keycloak/protocol/TestAuthenticatedClientSessionModel.java b/services/src/test/java/org/keycloak/protocol/TestAuthenticatedClientSessionModel.java index e7c5d165590..e586f71dac9 100644 --- a/services/src/test/java/org/keycloak/protocol/TestAuthenticatedClientSessionModel.java +++ b/services/src/test/java/org/keycloak/protocol/TestAuthenticatedClientSessionModel.java @@ -1,13 +1,13 @@ package org.keycloak.protocol; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; -import java.util.HashMap; -import java.util.Map; - public class TestAuthenticatedClientSessionModel implements AuthenticatedClientSessionModel { private final Map notes = new HashMap<>(); diff --git a/services/src/test/java/org/keycloak/protocol/docker/mapper/AllowAllDockerProtocolMapperTest.java b/services/src/test/java/org/keycloak/protocol/docker/mapper/AllowAllDockerProtocolMapperTest.java index b2a5071733f..0832c8e4929 100644 --- a/services/src/test/java/org/keycloak/protocol/docker/mapper/AllowAllDockerProtocolMapperTest.java +++ b/services/src/test/java/org/keycloak/protocol/docker/mapper/AllowAllDockerProtocolMapperTest.java @@ -1,7 +1,6 @@ package org.keycloak.protocol.docker.mapper; -import org.junit.Test; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ProtocolMapperModel; import org.keycloak.protocol.TestAuthenticatedClientSessionModel; @@ -9,6 +8,8 @@ import org.keycloak.protocol.docker.DockerAuthV2Protocol; import org.keycloak.representations.docker.DockerAccess; import org.keycloak.representations.docker.DockerResponseToken; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; diff --git a/services/src/test/java/org/keycloak/protocol/docker/mapper/TestAuthenticatedClientSessionModel.java b/services/src/test/java/org/keycloak/protocol/docker/mapper/TestAuthenticatedClientSessionModel.java index e55e85cfe4d..3f299338e90 100644 --- a/services/src/test/java/org/keycloak/protocol/docker/mapper/TestAuthenticatedClientSessionModel.java +++ b/services/src/test/java/org/keycloak/protocol/docker/mapper/TestAuthenticatedClientSessionModel.java @@ -1,13 +1,13 @@ package org.keycloak.protocol.docker.mapper; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; -import java.util.HashMap; -import java.util.Map; - class TestAuthenticatedClientSessionModel implements AuthenticatedClientSessionModel { private final Map notes = new HashMap<>(); diff --git a/services/src/test/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsProcessorTest.java b/services/src/test/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsProcessorTest.java index f45fe56010a..a57cbfb7516 100644 --- a/services/src/test/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsProcessorTest.java +++ b/services/src/test/java/org/keycloak/protocol/oid4vc/issuance/OID4VCAuthorizationDetailsProcessorTest.java @@ -16,12 +16,13 @@ */ package org.keycloak.protocol.oid4vc.issuance; -import org.junit.Test; +import java.util.Arrays; +import java.util.List; + import org.keycloak.protocol.oid4vc.model.AuthorizationDetail; import org.keycloak.protocol.oid4vc.model.ClaimsDescription; -import java.util.Arrays; -import java.util.List; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/services/src/test/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/CredentialBuilderFactoryTest.java b/services/src/test/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/CredentialBuilderFactoryTest.java index 5b8996b0917..d0d1babe41e 100644 --- a/services/src/test/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/CredentialBuilderFactoryTest.java +++ b/services/src/test/java/org/keycloak/protocol/oid4vc/issuance/credentialbuilder/CredentialBuilderFactoryTest.java @@ -1,14 +1,7 @@ package org.keycloak.protocol.oid4vc.issuance.credentialbuilder; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; - import java.util.List; -import org.junit.BeforeClass; -import org.junit.Test; + import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; import org.keycloak.common.crypto.CryptoIntegration; @@ -18,6 +11,15 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.services.resteasy.ResteasyKeycloakSession; import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; +import org.junit.BeforeClass; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; + public class CredentialBuilderFactoryTest { private static KeycloakSession session; diff --git a/services/src/test/java/org/keycloak/protocol/oid4vc/model/ProofSerializationTest.java b/services/src/test/java/org/keycloak/protocol/oid4vc/model/ProofSerializationTest.java index df287a9b58d..2ff7e3c9e32 100644 --- a/services/src/test/java/org/keycloak/protocol/oid4vc/model/ProofSerializationTest.java +++ b/services/src/test/java/org/keycloak/protocol/oid4vc/model/ProofSerializationTest.java @@ -19,6 +19,7 @@ package org.keycloak.protocol.oid4vc.model; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/services/src/test/java/org/keycloak/protocol/oid4vc/model/VerifiableCredentialTest.java b/services/src/test/java/org/keycloak/protocol/oid4vc/model/VerifiableCredentialTest.java index 2c4ba635423..243c22afce7 100644 --- a/services/src/test/java/org/keycloak/protocol/oid4vc/model/VerifiableCredentialTest.java +++ b/services/src/test/java/org/keycloak/protocol/oid4vc/model/VerifiableCredentialTest.java @@ -16,14 +16,15 @@ */ package org.keycloak.protocol.oid4vc.model; -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.net.URI; import java.util.Map; +import org.keycloak.util.JsonSerialization; + +import org.junit.Assert; +import org.junit.Test; + /** * @author Pascal Knueppel * @since 02.07.2024 diff --git a/services/src/test/java/org/keycloak/protocol/oidc/encode/DefaultTokenContextEncoderProviderTest.java b/services/src/test/java/org/keycloak/protocol/oidc/encode/DefaultTokenContextEncoderProviderTest.java index 5716f8cca3f..0670a6aa63c 100644 --- a/services/src/test/java/org/keycloak/protocol/oidc/encode/DefaultTokenContextEncoderProviderTest.java +++ b/services/src/test/java/org/keycloak/protocol/oidc/encode/DefaultTokenContextEncoderProviderTest.java @@ -24,11 +24,12 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; +import org.keycloak.OAuth2Constants; +import org.keycloak.util.JsonSerialization; + import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.keycloak.OAuth2Constants; -import org.keycloak.util.JsonSerialization; /** * @author Marek Posolda diff --git a/services/src/test/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelperTest.java b/services/src/test/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelperTest.java index ae0ba5311c4..f8c4f8c2cae 100644 --- a/services/src/test/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelperTest.java +++ b/services/src/test/java/org/keycloak/protocol/oidc/mappers/OIDCAttributeMapperHelperTest.java @@ -16,9 +16,10 @@ */ package org.keycloak.protocol.oidc.mappers; +import org.keycloak.utils.JsonUtils; + import org.hamcrest.Matchers; import org.junit.Test; -import org.keycloak.utils.JsonUtils; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/services/src/test/java/org/keycloak/protocol/oidc/utils/RedirectUtilsTest.java b/services/src/test/java/org/keycloak/protocol/oidc/utils/RedirectUtilsTest.java index 5d429e21937..8db0b58c36b 100644 --- a/services/src/test/java/org/keycloak/protocol/oidc/utils/RedirectUtilsTest.java +++ b/services/src/test/java/org/keycloak/protocol/oidc/utils/RedirectUtilsTest.java @@ -20,10 +20,7 @@ import java.net.URI; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.resteasy.mock.MockHttpRequest; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + import org.keycloak.common.Profile; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.crypto.CryptoProvider; @@ -33,6 +30,11 @@ import org.keycloak.services.resteasy.HttpRequestImpl; import org.keycloak.services.resteasy.ResteasyKeycloakSession; import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; +import org.jboss.resteasy.mock.MockHttpRequest; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + /** *

Little test class for RedirectUtils methods.

* diff --git a/services/src/test/java/org/keycloak/protocol/saml/SamlEncryptionTest.java b/services/src/test/java/org/keycloak/protocol/saml/SamlEncryptionTest.java index 4352aa0fc74..ab4ce9ca9c3 100644 --- a/services/src/test/java/org/keycloak/protocol/saml/SamlEncryptionTest.java +++ b/services/src/test/java/org/keycloak/protocol/saml/SamlEncryptionTest.java @@ -25,15 +25,7 @@ import java.util.Collections; import java.util.function.Function; import javax.crypto.Cipher; import javax.crypto.NoSuchPaddingException; -import org.apache.xml.security.encryption.XMLCipher; -import org.apache.xml.security.exceptions.XMLSecurityException; -import org.apache.xml.security.utils.EncryptionConstants; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.BeforeClass; -import org.junit.Test; + import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.ResponseType; @@ -48,6 +40,16 @@ import org.keycloak.saml.processing.core.saml.v2.util.AssertionUtil; import org.keycloak.saml.processing.core.util.XMLEncryptionUtil; import org.keycloak.services.resteasy.ResteasyKeycloakSession; import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; + +import org.apache.xml.security.encryption.XMLCipher; +import org.apache.xml.security.exceptions.XMLSecurityException; +import org.apache.xml.security.utils.EncryptionConstants; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.BeforeClass; +import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; diff --git a/services/src/test/java/org/keycloak/protocol/saml/SamlMetadataKeyLocatorTest.java b/services/src/test/java/org/keycloak/protocol/saml/SamlMetadataKeyLocatorTest.java index b416ba900f4..3f7565cf57e 100644 --- a/services/src/test/java/org/keycloak/protocol/saml/SamlMetadataKeyLocatorTest.java +++ b/services/src/test/java/org/keycloak/protocol/saml/SamlMetadataKeyLocatorTest.java @@ -26,10 +26,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.common.util.Time; import org.keycloak.crypto.KeyUse; import org.keycloak.crypto.KeyWrapper; @@ -40,6 +37,11 @@ import org.keycloak.rotation.KeyLocator; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.core.util.XMLSignatureUtil; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Test; + /** * * @author rmartinc diff --git a/services/src/test/java/org/keycloak/protocol/saml/SamlProtocolTest.java b/services/src/test/java/org/keycloak/protocol/saml/SamlProtocolTest.java index 2b2530e1bba..8e362631552 100644 --- a/services/src/test/java/org/keycloak/protocol/saml/SamlProtocolTest.java +++ b/services/src/test/java/org/keycloak/protocol/saml/SamlProtocolTest.java @@ -1,17 +1,28 @@ package org.keycloak.protocol.saml; +import java.net.URI; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.stream.Stream; + import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriInfo; -import org.jboss.resteasy.core.ResteasyContext; -import org.jboss.resteasy.mock.MockHttpRequest; -import org.jboss.resteasy.specimpl.ResteasyUriInfo; -import org.junit.BeforeClass; -import org.junit.Test; + import org.keycloak.common.Profile; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.crypto.CryptoProvider; import org.keycloak.common.enums.SslRequired; import org.keycloak.component.ComponentModel; +import org.keycloak.crypto.Algorithm; +import org.keycloak.crypto.KeyStatus; +import org.keycloak.crypto.KeyType; +import org.keycloak.crypto.KeyUse; +import org.keycloak.crypto.KeyWrapper; import org.keycloak.http.HttpRequest; import org.keycloak.keys.DefaultKeyManager; import org.keycloak.models.AuthenticatedClientSessionModel; @@ -43,22 +54,14 @@ import org.keycloak.models.WebAuthnPolicy; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.DefaultKeycloakSessionFactory; import org.keycloak.services.resteasy.HttpRequestImpl; -import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; import org.keycloak.services.resteasy.ResteasyKeycloakSession; -import org.keycloak.crypto.KeyWrapper; -import org.keycloak.crypto.KeyStatus; -import org.keycloak.crypto.KeyType; -import org.keycloak.crypto.KeyUse; -import org.keycloak.crypto.Algorithm; -import java.net.URI; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.stream.Stream; +import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; + +import org.jboss.resteasy.core.ResteasyContext; +import org.jboss.resteasy.mock.MockHttpRequest; +import org.jboss.resteasy.specimpl.ResteasyUriInfo; +import org.junit.BeforeClass; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; diff --git a/services/src/test/java/org/keycloak/protocol/saml/SamlProtocolUtilsTest.java b/services/src/test/java/org/keycloak/protocol/saml/SamlProtocolUtilsTest.java index e882353b9c2..bb7b0a007fc 100644 --- a/services/src/test/java/org/keycloak/protocol/saml/SamlProtocolUtilsTest.java +++ b/services/src/test/java/org/keycloak/protocol/saml/SamlProtocolUtilsTest.java @@ -1,6 +1,9 @@ package org.keycloak.protocol.saml; -import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.util.UUID; + import org.keycloak.dom.saml.v2.protocol.ArtifactResponseType; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.saml.SAML2LoginResponseBuilder; @@ -12,16 +15,14 @@ import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.common.util.StaxUtil; import org.keycloak.saml.processing.core.saml.v2.common.IDGenerator; import org.keycloak.saml.processing.core.saml.v2.writers.SAMLResponseWriter; + +import org.junit.Test; import org.w3c.dom.Document; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.util.UUID; - +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.lessThan; -import static org.hamcrest.MatcherAssert.assertThat; public class SamlProtocolUtilsTest { diff --git a/services/src/test/java/org/keycloak/protocol/saml/profile/util/SoapTest.java b/services/src/test/java/org/keycloak/protocol/saml/profile/util/SoapTest.java index 113b569728b..f915f0e62e4 100644 --- a/services/src/test/java/org/keycloak/protocol/saml/profile/util/SoapTest.java +++ b/services/src/test/java/org/keycloak/protocol/saml/profile/util/SoapTest.java @@ -16,9 +16,6 @@ */ package org.keycloak.protocol.saml.profile.util; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -26,18 +23,11 @@ import java.net.InetSocketAddress; import java.net.URI; import java.util.Collections; import java.util.HashMap; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.xml.soap.SOAPException; import jakarta.xml.soap.SOAPMessage; -import org.apache.commons.io.IOUtils; -import org.hamcrest.CoreMatchers; -import org.hamcrest.MatcherAssert; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.common.crypto.CryptoIntegration; @@ -54,6 +44,19 @@ import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.services.resteasy.ResteasyKeycloakSession; import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; import org.keycloak.utils.ScopeUtil; + +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; +import org.apache.commons.io.IOUtils; +import org.hamcrest.CoreMatchers; +import org.hamcrest.MatcherAssert; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; import org.w3c.dom.Document; /** diff --git a/services/src/test/java/org/keycloak/services/DefaultKeycloakSessionFactoryTest.java b/services/src/test/java/org/keycloak/services/DefaultKeycloakSessionFactoryTest.java index d3322b03839..18959642f5a 100644 --- a/services/src/test/java/org/keycloak/services/DefaultKeycloakSessionFactoryTest.java +++ b/services/src/test/java/org/keycloak/services/DefaultKeycloakSessionFactoryTest.java @@ -1,9 +1,9 @@ package org.keycloak.services; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + import org.keycloak.Config; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; @@ -12,11 +12,12 @@ import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; import org.keycloak.vault.VaultProvider; -import static org.junit.Assert.assertFalse; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; +import static org.junit.Assert.assertFalse; public class DefaultKeycloakSessionFactoryTest { diff --git a/services/src/test/java/org/keycloak/services/clientpolicy/executor/SecureRedirectUrisEnforcerExecutorTest.java b/services/src/test/java/org/keycloak/services/clientpolicy/executor/SecureRedirectUrisEnforcerExecutorTest.java index 9802910164f..660893564f6 100644 --- a/services/src/test/java/org/keycloak/services/clientpolicy/executor/SecureRedirectUrisEnforcerExecutorTest.java +++ b/services/src/test/java/org/keycloak/services/clientpolicy/executor/SecureRedirectUrisEnforcerExecutorTest.java @@ -17,20 +17,11 @@ package org.keycloak.services.clientpolicy.executor; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.net.URISyntaxException; import java.util.Arrays; import java.util.Collections; import java.util.stream.Stream; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; import org.keycloak.OAuthErrorException; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutor.Configuration; @@ -41,16 +32,25 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.BooleanNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; import static org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory.ALLOW_HTTP_SCHEME; import static org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory.ALLOW_IPV4_LOOPBACK_ADDRESS; import static org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory.ALLOW_IPV6_LOOPBACK_ADDRESS; -import static org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory.ALLOW_PRIVATE_USE_URI_SCHEME; -import static org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory.ALLOW_WILDCARD_CONTEXT_PATH; import static org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory.ALLOW_OPEN_REDIRECT; import static org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory.ALLOW_PERMITTED_DOMAINS; +import static org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory.ALLOW_PRIVATE_USE_URI_SCHEME; +import static org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory.ALLOW_WILDCARD_CONTEXT_PATH; import static org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory.OAUTH_2_1_COMPLIANT; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class SecureRedirectUrisEnforcerExecutorTest { private static SecureRedirectUrisEnforcerExecutor executor; diff --git a/services/src/test/java/org/keycloak/services/clientregistration/policy/impl/TrustedHostClientRegistrationPolicyTest.java b/services/src/test/java/org/keycloak/services/clientregistration/policy/impl/TrustedHostClientRegistrationPolicyTest.java index f14ed1255f2..52c25a0b07c 100644 --- a/services/src/test/java/org/keycloak/services/clientregistration/policy/impl/TrustedHostClientRegistrationPolicyTest.java +++ b/services/src/test/java/org/keycloak/services/clientregistration/policy/impl/TrustedHostClientRegistrationPolicyTest.java @@ -16,12 +16,6 @@ */ package org.keycloak.services.clientregistration.policy.impl; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; import org.keycloak.common.Profile; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.crypto.CryptoProvider; @@ -31,6 +25,13 @@ import org.keycloak.services.clientregistration.policy.ClientRegistrationPolicyE import org.keycloak.services.resteasy.ResteasyKeycloakSession; import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * * @author rmartinc diff --git a/services/src/test/java/org/keycloak/services/resteasy/HttpRequestImpl.java b/services/src/test/java/org/keycloak/services/resteasy/HttpRequestImpl.java index b56ba499dce..577dab309c9 100644 --- a/services/src/test/java/org/keycloak/services/resteasy/HttpRequestImpl.java +++ b/services/src/test/java/org/keycloak/services/resteasy/HttpRequestImpl.java @@ -17,8 +17,6 @@ package org.keycloak.services.resteasy; -import static jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA_TYPE; - import java.io.IOException; import java.security.cert.X509Certificate; import java.util.Collection; @@ -32,13 +30,16 @@ import jakarta.ws.rs.core.UriInfo; import jakarta.ws.rs.ext.MessageBodyReader; import jakarta.ws.rs.ext.Providers; -import org.jboss.resteasy.core.ResteasyContext; -import org.jboss.resteasy.reactive.server.multipart.FormValue; -import org.jboss.resteasy.reactive.server.multipart.MultipartFormDataInput; import org.keycloak.http.FormPartValue; import org.keycloak.http.HttpRequest; import org.keycloak.services.FormPartValueImpl; +import org.jboss.resteasy.core.ResteasyContext; +import org.jboss.resteasy.reactive.server.multipart.FormValue; +import org.jboss.resteasy.reactive.server.multipart.MultipartFormDataInput; + +import static jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA_TYPE; + public class HttpRequestImpl implements HttpRequest { private org.jboss.resteasy.spi.HttpRequest delegate; diff --git a/services/src/test/java/org/keycloak/services/resteasy/HttpResponseImpl.java b/services/src/test/java/org/keycloak/services/resteasy/HttpResponseImpl.java index 2befdd5e561..b2e7bb46978 100644 --- a/services/src/test/java/org/keycloak/services/resteasy/HttpResponseImpl.java +++ b/services/src/test/java/org/keycloak/services/resteasy/HttpResponseImpl.java @@ -17,12 +17,13 @@ package org.keycloak.services.resteasy; -import jakarta.ws.rs.core.NewCookie; -import org.keycloak.http.HttpResponse; - import java.util.HashSet; import java.util.Set; +import jakarta.ws.rs.core.NewCookie; + +import org.keycloak.http.HttpResponse; + public class HttpResponseImpl implements HttpResponse { private final org.jboss.resteasy.spi.HttpResponse delegate; diff --git a/services/src/test/java/org/keycloak/services/resteasy/ResteasyKeycloakApplication.java b/services/src/test/java/org/keycloak/services/resteasy/ResteasyKeycloakApplication.java index ce91636962d..ef89526fcac 100644 --- a/services/src/test/java/org/keycloak/services/resteasy/ResteasyKeycloakApplication.java +++ b/services/src/test/java/org/keycloak/services/resteasy/ResteasyKeycloakApplication.java @@ -17,6 +17,9 @@ package org.keycloak.services.resteasy; +import java.util.HashSet; +import java.util.Set; + import org.keycloak.common.Profile; import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.models.KeycloakSession; @@ -35,9 +38,6 @@ import org.keycloak.services.resources.WelcomeResource; import org.keycloak.services.resources.admin.AdminRoot; import org.keycloak.services.util.ObjectMapperResolver; -import java.util.HashSet; -import java.util.Set; - public class ResteasyKeycloakApplication extends KeycloakApplication { protected Set singletons = new HashSet<>(); diff --git a/services/src/test/java/org/keycloak/services/resteasy/ResteasyKeycloakContext.java b/services/src/test/java/org/keycloak/services/resteasy/ResteasyKeycloakContext.java index 13923801b07..c1ebd9d0da1 100644 --- a/services/src/test/java/org/keycloak/services/resteasy/ResteasyKeycloakContext.java +++ b/services/src/test/java/org/keycloak/services/resteasy/ResteasyKeycloakContext.java @@ -17,12 +17,13 @@ package org.keycloak.services.resteasy; -import org.jboss.resteasy.core.ResteasyContext; import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; import org.keycloak.models.KeycloakSession; import org.keycloak.services.DefaultKeycloakContext; +import org.jboss.resteasy.core.ResteasyContext; + public class ResteasyKeycloakContext extends DefaultKeycloakContext { public ResteasyKeycloakContext(KeycloakSession session) { diff --git a/services/src/test/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProverFactoryTest.java b/services/src/test/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProverFactoryTest.java index 7caf5e9bfe9..3dbbb747ba9 100644 --- a/services/src/test/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProverFactoryTest.java +++ b/services/src/test/java/org/keycloak/services/securityprofile/DefaultSecurityProfileProverFactoryTest.java @@ -20,12 +20,7 @@ package org.keycloak.services.securityprofile; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameters; + import org.keycloak.common.Profile; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.crypto.CryptoProvider; @@ -36,6 +31,13 @@ import org.keycloak.services.resteasy.ResteasyKeycloakSession; import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; import org.keycloak.utils.ScopeUtil; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + /** * * @author rmartinc diff --git a/services/src/test/java/org/keycloak/services/util/LocaleUtilTest.java b/services/src/test/java/org/keycloak/services/util/LocaleUtilTest.java index a5eb8779d9f..2b57bfc842c 100644 --- a/services/src/test/java/org/keycloak/services/util/LocaleUtilTest.java +++ b/services/src/test/java/org/keycloak/services/util/LocaleUtilTest.java @@ -1,11 +1,5 @@ package org.keycloak.services.util; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; - -import org.junit.Test; - import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -14,6 +8,12 @@ import java.util.Locale; import java.util.Map; import java.util.Properties; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; + /** * @author Daniel Fesenmeyer */ diff --git a/services/src/test/java/org/keycloak/social/github/GitHubIdentityProviderTest.java b/services/src/test/java/org/keycloak/social/github/GitHubIdentityProviderTest.java index e059820c9da..0d3ab313ccd 100644 --- a/services/src/test/java/org/keycloak/social/github/GitHubIdentityProviderTest.java +++ b/services/src/test/java/org/keycloak/social/github/GitHubIdentityProviderTest.java @@ -16,10 +16,11 @@ */ package org.keycloak.social.github; -import static org.junit.Assert.assertEquals; +import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; import org.junit.Test; -import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; + +import static org.junit.Assert.assertEquals; /** * Unit test for {@link org.keycloak.social.github.GitHubIdentityProvider}. diff --git a/services/src/test/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderTest.java b/services/src/test/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderTest.java index 18a15ab3c1e..623d238fcb0 100644 --- a/services/src/test/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderTest.java +++ b/services/src/test/java/org/keycloak/social/openshift/OpenshiftV4IdentityProviderTest.java @@ -1,14 +1,5 @@ package org.keycloak.social.openshift; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.commons.io.IOUtils; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.keycloak.broker.provider.IdentityBrokerException; -import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.KeycloakSession; - import java.io.ByteArrayInputStream; import java.io.InputStream; import java.net.URL; @@ -16,6 +7,16 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; +import org.keycloak.broker.provider.IdentityBrokerException; +import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.KeycloakSession; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.commons.io.IOUtils; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + public class OpenshiftV4IdentityProviderTest { private final String TEST_OAUTH_METADATA_FILE = "/org/keycloak/test/social/openshift/OpenshiftV4-oauth-metadata.json"; diff --git a/services/src/test/java/org/keycloak/test/ResponseTypeTest.java b/services/src/test/java/org/keycloak/test/ResponseTypeTest.java index 3bab4fdf7b9..e62865c166d 100644 --- a/services/src/test/java/org/keycloak/test/ResponseTypeTest.java +++ b/services/src/test/java/org/keycloak/test/ResponseTypeTest.java @@ -17,13 +17,14 @@ package org.keycloak.test; -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.protocol.oidc.utils.OIDCResponseType; - import java.util.Arrays; import java.util.Collections; +import org.keycloak.protocol.oidc.utils.OIDCResponseType; + +import org.junit.Assert; +import org.junit.Test; + /** * @author Marek Posolda */ diff --git a/services/src/test/java/org/keycloak/test/ValidationTest.java b/services/src/test/java/org/keycloak/test/ValidationTest.java index 63fa3f692af..49fce97c45d 100644 --- a/services/src/test/java/org/keycloak/test/ValidationTest.java +++ b/services/src/test/java/org/keycloak/test/ValidationTest.java @@ -17,9 +17,10 @@ package org.keycloak.test; +import org.keycloak.services.validation.Validation; + import org.junit.Assert; import org.junit.Test; -import org.keycloak.services.validation.Validation; /** * @author Marek Posolda diff --git a/services/src/test/java/org/keycloak/test/broker/oidc/AbstractOAuth2IdentityProviderTest.java b/services/src/test/java/org/keycloak/test/broker/oidc/AbstractOAuth2IdentityProviderTest.java index ba949feac8d..02b5966bc63 100755 --- a/services/src/test/java/org/keycloak/test/broker/oidc/AbstractOAuth2IdentityProviderTest.java +++ b/services/src/test/java/org/keycloak/test/broker/oidc/AbstractOAuth2IdentityProviderTest.java @@ -16,9 +16,10 @@ */ package org.keycloak.test.broker.oidc; -import com.fasterxml.jackson.databind.JsonNode; -import org.junit.Assert; -import org.junit.Test; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider; import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; import org.keycloak.broker.provider.BrokeredIdentityContext; @@ -26,9 +27,9 @@ import org.keycloak.broker.provider.IdentityBrokerException; import org.keycloak.models.IdentityProviderModel; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; +import com.fasterxml.jackson.databind.JsonNode; +import org.junit.Assert; +import org.junit.Test; /** * Unit test for {@link org.keycloak.broker.oidc.AbstractOAuth2IdentityProvider} diff --git a/services/src/test/java/org/keycloak/test/broker/oidc/mappers/AbstractJsonUserAttributeMapperTest.java b/services/src/test/java/org/keycloak/test/broker/oidc/mappers/AbstractJsonUserAttributeMapperTest.java index ab8487c7fc0..e0eb882fda2 100755 --- a/services/src/test/java/org/keycloak/test/broker/oidc/mappers/AbstractJsonUserAttributeMapperTest.java +++ b/services/src/test/java/org/keycloak/test/broker/oidc/mappers/AbstractJsonUserAttributeMapperTest.java @@ -16,14 +16,15 @@ */ package org.keycloak.test.broker.oidc.mappers; +import java.io.IOException; +import java.util.Arrays; + +import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Test; -import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper; - -import java.io.IOException; -import java.util.Arrays; /** * Unit test for {@link org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper} diff --git a/services/src/test/java/org/keycloak/test/broker/saml/SAMLDataMarshallerTest.java b/services/src/test/java/org/keycloak/test/broker/saml/SAMLDataMarshallerTest.java index f037b591d22..b74777fa76b 100755 --- a/services/src/test/java/org/keycloak/test/broker/saml/SAMLDataMarshallerTest.java +++ b/services/src/test/java/org/keycloak/test/broker/saml/SAMLDataMarshallerTest.java @@ -18,16 +18,19 @@ package org.keycloak.test.broker.saml; -import org.junit.Assert; -import org.junit.Test; +import java.io.InputStream; + import org.keycloak.broker.saml.SAMLDataMarshaller; import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.saml.processing.core.parsers.saml.SAMLParser; -import java.io.InputStream; + import org.hamcrest.CoreMatchers; +import org.junit.Assert; +import org.junit.Test; + import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/services/src/test/java/org/keycloak/test/broker/saml/SAMLParsingTest.java b/services/src/test/java/org/keycloak/test/broker/saml/SAMLParsingTest.java index 327b28c67b1..805fa4d3d0b 100644 --- a/services/src/test/java/org/keycloak/test/broker/saml/SAMLParsingTest.java +++ b/services/src/test/java/org/keycloak/test/broker/saml/SAMLParsingTest.java @@ -17,12 +17,13 @@ package org.keycloak.test.broker.saml; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.saml.SAMLRequestParser; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.saml.processing.web.util.PostBindingUtil; +import org.junit.Assert; +import org.junit.Test; + /** * This was failing on IBM JDK * diff --git a/services/src/test/java/org/keycloak/test/broker/saml/XPathAttributeMapperTest.java b/services/src/test/java/org/keycloak/test/broker/saml/XPathAttributeMapperTest.java index 9b60a0a658f..7f317d97147 100644 --- a/services/src/test/java/org/keycloak/test/broker/saml/XPathAttributeMapperTest.java +++ b/services/src/test/java/org/keycloak/test/broker/saml/XPathAttributeMapperTest.java @@ -1,17 +1,9 @@ package org.keycloak.test.broker.saml; -import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; - import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; + import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.saml.SAMLEndpoint; import org.keycloak.broker.saml.mappers.XPathAttributeMapper; @@ -24,6 +16,16 @@ import org.keycloak.models.IdentityProviderModel; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.processing.core.saml.v2.util.AssertionUtil; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.allOf; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; + public class XPathAttributeMapperTest { private static final String ATTRIBUTE_NAME = "attributeName"; diff --git a/services/src/test/java/org/keycloak/test/login/freemarker/model/IdentityProviderBeanTest.java b/services/src/test/java/org/keycloak/test/login/freemarker/model/IdentityProviderBeanTest.java index 653228dd12d..ecc303c8b69 100755 --- a/services/src/test/java/org/keycloak/test/login/freemarker/model/IdentityProviderBeanTest.java +++ b/services/src/test/java/org/keycloak/test/login/freemarker/model/IdentityProviderBeanTest.java @@ -20,11 +20,12 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.forms.login.freemarker.model.IdentityProviderBean; import org.keycloak.forms.login.freemarker.model.IdentityProviderBean.IdentityProvider; +import org.junit.Assert; +import org.junit.Test; + /** * Unit test for {@link org.keycloak.forms.login.freemarker.model.IdentityProviderBean} * diff --git a/services/src/test/java/org/keycloak/theme/FolderThemeTest.java b/services/src/test/java/org/keycloak/theme/FolderThemeTest.java index c85d581d88a..175d68911d8 100644 --- a/services/src/test/java/org/keycloak/theme/FolderThemeTest.java +++ b/services/src/test/java/org/keycloak/theme/FolderThemeTest.java @@ -17,15 +17,16 @@ package org.keycloak.theme; -import static org.junit.Assert.assertNotNull; -import static org.keycloak.theme.Theme.Type.LOGIN; - -import org.junit.Test; - import java.io.File; import java.util.Locale; import java.util.Set; +import org.junit.Test; + +import static org.keycloak.theme.Theme.Type.LOGIN; + +import static org.junit.Assert.assertNotNull; + public class FolderThemeTest { private final Set someValidISOLocaleCodes = Set.of("de", "de-DE", "de-x-informal"); diff --git a/services/src/test/java/org/keycloak/theme/KeycloakSanitizerTest.java b/services/src/test/java/org/keycloak/theme/KeycloakSanitizerTest.java index db9a9f84344..d9c3d4704cd 100644 --- a/services/src/test/java/org/keycloak/theme/KeycloakSanitizerTest.java +++ b/services/src/test/java/org/keycloak/theme/KeycloakSanitizerTest.java @@ -19,6 +19,7 @@ package org.keycloak.theme; import java.util.ArrayList; import java.util.List; + import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -123,4 +124,3 @@ public class KeycloakSanitizerTest { } } - diff --git a/services/src/test/java/org/keycloak/theme/PropertiesUtilTest.java b/services/src/test/java/org/keycloak/theme/PropertiesUtilTest.java index bffb2b8ecab..eee5802dc09 100644 --- a/services/src/test/java/org/keycloak/theme/PropertiesUtilTest.java +++ b/services/src/test/java/org/keycloak/theme/PropertiesUtilTest.java @@ -17,8 +17,6 @@ package org.keycloak.theme; -import org.junit.Test; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -26,6 +24,8 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Properties; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; diff --git a/services/src/test/java/org/keycloak/theme/ResourceLoaderTest.java b/services/src/test/java/org/keycloak/theme/ResourceLoaderTest.java index e52464d63fb..7bfa9c30cc4 100644 --- a/services/src/test/java/org/keycloak/theme/ResourceLoaderTest.java +++ b/services/src/test/java/org/keycloak/theme/ResourceLoaderTest.java @@ -1,8 +1,5 @@ package org.keycloak.theme; -import org.junit.Assert; -import org.junit.Test; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -11,6 +8,9 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import org.junit.Assert; +import org.junit.Test; + public class ResourceLoaderTest { static String NONE = "../"; diff --git a/services/src/test/java/org/keycloak/theme/beans/LinkExpirationFormatterMethodTest.java b/services/src/test/java/org/keycloak/theme/beans/LinkExpirationFormatterMethodTest.java index 1dd5725f46d..01f0e1661d6 100644 --- a/services/src/test/java/org/keycloak/theme/beans/LinkExpirationFormatterMethodTest.java +++ b/services/src/test/java/org/keycloak/theme/beans/LinkExpirationFormatterMethodTest.java @@ -19,12 +19,11 @@ import java.util.Objects; import java.util.Properties; import java.util.stream.Collectors; +import freemarker.template.TemplateModelException; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; -import freemarker.template.TemplateModelException; - /** * @author Vlastimil Elias (velias at redhat dot com) */ diff --git a/services/src/test/java/org/keycloak/theme/beans/LocaleBeanTest.java b/services/src/test/java/org/keycloak/theme/beans/LocaleBeanTest.java index cb7b134b764..3f81774b7ef 100644 --- a/services/src/test/java/org/keycloak/theme/beans/LocaleBeanTest.java +++ b/services/src/test/java/org/keycloak/theme/beans/LocaleBeanTest.java @@ -17,13 +17,13 @@ package org.keycloak.theme.beans; +import java.util.Locale; +import java.util.Set; + import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Test; -import java.util.Locale; -import java.util.Set; - /** * @author Alexander Schwartz */ diff --git a/services/src/test/java/org/keycloak/theme/beans/MessageFormatterMethodTest.java b/services/src/test/java/org/keycloak/theme/beans/MessageFormatterMethodTest.java index a29062b20c0..3b22c3ce67a 100644 --- a/services/src/test/java/org/keycloak/theme/beans/MessageFormatterMethodTest.java +++ b/services/src/test/java/org/keycloak/theme/beans/MessageFormatterMethodTest.java @@ -17,16 +17,16 @@ package org.keycloak.theme.beans; +import java.util.Arrays; +import java.util.Locale; +import java.util.Properties; + import freemarker.template.SimpleNumber; import freemarker.template.SimpleScalar; import freemarker.template.TemplateModelException; import org.junit.Assert; import org.junit.Test; -import java.util.Arrays; -import java.util.Locale; -import java.util.Properties; - /** * @author Marko Strukelj */ diff --git a/services/src/test/java/org/keycloak/truststore/FileTruststoreProviderFactoryTest.java b/services/src/test/java/org/keycloak/truststore/FileTruststoreProviderFactoryTest.java index 43074bc6cd8..11d51291022 100644 --- a/services/src/test/java/org/keycloak/truststore/FileTruststoreProviderFactoryTest.java +++ b/services/src/test/java/org/keycloak/truststore/FileTruststoreProviderFactoryTest.java @@ -17,14 +17,15 @@ package org.keycloak.truststore; -import org.junit.Test; -import org.keycloak.common.enums.HostnameVerificationPolicy; -import org.keycloak.utils.ScopeUtil; - import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.keycloak.common.enums.HostnameVerificationPolicy; +import org.keycloak.utils.ScopeUtil; + +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/services/src/test/java/org/keycloak/truststore/TruststoreBuilderTest.java b/services/src/test/java/org/keycloak/truststore/TruststoreBuilderTest.java index 164dece653b..1a4a9e35639 100644 --- a/services/src/test/java/org/keycloak/truststore/TruststoreBuilderTest.java +++ b/services/src/test/java/org/keycloak/truststore/TruststoreBuilderTest.java @@ -17,14 +17,14 @@ package org.keycloak.truststore; -import org.junit.Test; - import java.io.File; import java.net.URL; import java.security.KeyStore; import java.util.ArrayList; import java.util.Collections; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; diff --git a/services/src/test/java/org/keycloak/url/HostnameV2ProviderFactoryTest.java b/services/src/test/java/org/keycloak/url/HostnameV2ProviderFactoryTest.java index 34e2b1c0446..70c2966895e 100644 --- a/services/src/test/java/org/keycloak/url/HostnameV2ProviderFactoryTest.java +++ b/services/src/test/java/org/keycloak/url/HostnameV2ProviderFactoryTest.java @@ -17,18 +17,19 @@ package org.keycloak.url; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.junit.Test; import org.keycloak.utils.ScopeUtil; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + public class HostnameV2ProviderFactoryTest { @Test diff --git a/services/src/test/java/org/keycloak/utils/JsonConfigProvider.java b/services/src/test/java/org/keycloak/utils/JsonConfigProvider.java index 6a6d253cd42..0752bb6c775 100755 --- a/services/src/test/java/org/keycloak/utils/JsonConfigProvider.java +++ b/services/src/test/java/org/keycloak/utils/JsonConfigProvider.java @@ -19,14 +19,14 @@ package org.keycloak.utils; import java.util.Set; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.NullNode; - import org.keycloak.Config; import org.keycloak.Config.Scope; import org.keycloak.common.util.StringPropertyReplacer; import org.keycloak.common.util.SystemEnvProperties; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.NullNode; + /** * @author Stian Thorgersen */ diff --git a/services/src/test/java/org/keycloak/utils/RegexUtilsTest.java b/services/src/test/java/org/keycloak/utils/RegexUtilsTest.java index 437b23f5fd9..854e92b1b96 100644 --- a/services/src/test/java/org/keycloak/utils/RegexUtilsTest.java +++ b/services/src/test/java/org/keycloak/utils/RegexUtilsTest.java @@ -1,11 +1,11 @@ package org.keycloak.utils; -import org.junit.Test; - import java.util.Arrays; -import static org.hamcrest.Matchers.is; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; /** * Benjamin Weimer, diff --git a/services/src/test/java/org/keycloak/utils/ScopeUtil.java b/services/src/test/java/org/keycloak/utils/ScopeUtil.java index 1abb1fb3223..4528720cdcc 100644 --- a/services/src/test/java/org/keycloak/utils/ScopeUtil.java +++ b/services/src/test/java/org/keycloak/utils/ScopeUtil.java @@ -17,14 +17,14 @@ package org.keycloak.utils; -import org.junit.Assert; - import java.io.IOException; import java.util.Map; +import org.keycloak.utils.JsonConfigProvider.JsonScope; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import org.keycloak.utils.JsonConfigProvider.JsonScope; +import org.junit.Assert; public class ScopeUtil { diff --git a/services/src/test/java/org/keycloak/utils/SearchQueryUtilsTest.java b/services/src/test/java/org/keycloak/utils/SearchQueryUtilsTest.java index 477183e4dae..3f7c27c0bbf 100644 --- a/services/src/test/java/org/keycloak/utils/SearchQueryUtilsTest.java +++ b/services/src/test/java/org/keycloak/utils/SearchQueryUtilsTest.java @@ -17,11 +17,11 @@ package org.keycloak.utils; -import org.junit.Test; - import java.util.HashMap; import java.util.Map; +import org.junit.Test; + import static org.junit.Assert.assertEquals; /** diff --git a/services/src/test/java/org/keycloak/utils/SecureContextResolverTest.java b/services/src/test/java/org/keycloak/utils/SecureContextResolverTest.java index 9e156cd52a4..e59f225c681 100644 --- a/services/src/test/java/org/keycloak/utils/SecureContextResolverTest.java +++ b/services/src/test/java/org/keycloak/utils/SecureContextResolverTest.java @@ -1,16 +1,17 @@ package org.keycloak.utils; -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.representations.account.DeviceRepresentation; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.net.URI; import java.net.URISyntaxException; import java.util.function.Supplier; +import org.keycloak.representations.account.DeviceRepresentation; + +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class SecureContextResolverTest { static DeviceRepresentation DEVICE_UNKOWN; diff --git a/services/src/test/java/org/keycloak/vault/KeystoreVaultProviderTest.java b/services/src/test/java/org/keycloak/vault/KeystoreVaultProviderTest.java index 6550c8959f6..2041fe60e62 100644 --- a/services/src/test/java/org/keycloak/vault/KeystoreVaultProviderTest.java +++ b/services/src/test/java/org/keycloak/vault/KeystoreVaultProviderTest.java @@ -1,18 +1,20 @@ package org.keycloak.vault; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; -import org.keycloak.common.util.Environment; - import java.nio.file.Paths; import java.util.Arrays; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; +import org.keycloak.common.util.Environment; + +import org.junit.Assume; +import org.junit.Before; +import org.junit.Test; + import static org.keycloak.vault.SecretContains.secretContains; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; + /** * Tests for {@link FilesKeystoreVaultProvider}. * diff --git a/services/src/test/java/org/keycloak/vault/PlainTextVaultProviderFactoryTest.java b/services/src/test/java/org/keycloak/vault/PlainTextVaultProviderFactoryTest.java index e3e9360532d..7c409775e92 100644 --- a/services/src/test/java/org/keycloak/vault/PlainTextVaultProviderFactoryTest.java +++ b/services/src/test/java/org/keycloak/vault/PlainTextVaultProviderFactoryTest.java @@ -1,19 +1,20 @@ package org.keycloak.vault; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import java.util.Set; + import org.keycloak.Config; import org.keycloak.Config.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.services.resteasy.ResteasyKeycloakSession; import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import java.util.Set; - /** * Tests for {@link FilesPlainTextVaultProviderFactory}. * diff --git a/services/src/test/java/org/keycloak/vault/PlainTextVaultProviderTest.java b/services/src/test/java/org/keycloak/vault/PlainTextVaultProviderTest.java index 5e4a4d56d48..c85a34c749a 100644 --- a/services/src/test/java/org/keycloak/vault/PlainTextVaultProviderTest.java +++ b/services/src/test/java/org/keycloak/vault/PlainTextVaultProviderTest.java @@ -1,9 +1,7 @@ package org.keycloak.vault; -import org.junit.Test; -import org.junit.Before; -import org.junit.After; - +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -15,16 +13,19 @@ import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.vault.SecretContains.secretContains; import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; -import static org.keycloak.vault.SecretContains.secretContains; /** * Tests for {@link FilesPlainTextVaultProvider}. diff --git a/services/src/test/java/org/keycloak/vault/SecretContains.java b/services/src/test/java/org/keycloak/vault/SecretContains.java index 49919bd2366..54371d06e77 100644 --- a/services/src/test/java/org/keycloak/vault/SecretContains.java +++ b/services/src/test/java/org/keycloak/vault/SecretContains.java @@ -1,11 +1,11 @@ package org.keycloak.vault; +import java.nio.charset.StandardCharsets; + import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeMatcher; -import java.nio.charset.StandardCharsets; - /** * Checks if {@link VaultRawSecret} is equal to a String. */ diff --git a/test-framework/clustering/src/main/java/org/keycloak/testframework/ClusteringTestFrameworkExtension.java b/test-framework/clustering/src/main/java/org/keycloak/testframework/ClusteringTestFrameworkExtension.java index 9e6e2deb856..1cb0acd03a5 100644 --- a/test-framework/clustering/src/main/java/org/keycloak/testframework/ClusteringTestFrameworkExtension.java +++ b/test-framework/clustering/src/main/java/org/keycloak/testframework/ClusteringTestFrameworkExtension.java @@ -1,11 +1,11 @@ package org.keycloak.testframework; +import java.util.List; + import org.keycloak.testframework.clustering.LoadBalancerSupplier; import org.keycloak.testframework.injection.Supplier; import org.keycloak.testframework.server.ClusteredKeycloakServerSupplier; -import java.util.List; - public class ClusteringTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/clustering/src/main/java/org/keycloak/testframework/clustering/LoadBalancer.java b/test-framework/clustering/src/main/java/org/keycloak/testframework/clustering/LoadBalancer.java index 232e6845a48..820f16c29cf 100644 --- a/test-framework/clustering/src/main/java/org/keycloak/testframework/clustering/LoadBalancer.java +++ b/test-framework/clustering/src/main/java/org/keycloak/testframework/clustering/LoadBalancer.java @@ -2,10 +2,6 @@ package org.keycloak.testframework.clustering; import java.util.HashMap; -import io.vertx.httpproxy.ProxyContext; -import io.vertx.httpproxy.ProxyInterceptor; -import io.vertx.httpproxy.ProxyResponse; -import org.jboss.logging.Logger; import org.keycloak.testframework.server.ClusteredKeycloakServer; import org.keycloak.testframework.server.KeycloakUrls; @@ -14,6 +10,10 @@ import io.vertx.core.Vertx; import io.vertx.core.http.HttpClient; import io.vertx.core.http.HttpServer; import io.vertx.httpproxy.HttpProxy; +import io.vertx.httpproxy.ProxyContext; +import io.vertx.httpproxy.ProxyInterceptor; +import io.vertx.httpproxy.ProxyResponse; +import org.jboss.logging.Logger; public class LoadBalancer { diff --git a/test-framework/clustering/src/main/java/org/keycloak/testframework/server/ClusteredKeycloakServer.java b/test-framework/clustering/src/main/java/org/keycloak/testframework/server/ClusteredKeycloakServer.java index b3ec5cad0d7..68b08c7c5cf 100644 --- a/test-framework/clustering/src/main/java/org/keycloak/testframework/server/ClusteredKeycloakServer.java +++ b/test-framework/clustering/src/main/java/org/keycloak/testframework/server/ClusteredKeycloakServer.java @@ -22,12 +22,13 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.infinispan.server.test.core.CountdownLatchLoggingConsumer; -import org.jboss.logging.Logger; import org.keycloak.it.utils.DockerKeycloakDistribution; import org.keycloak.testframework.clustering.LoadBalancer; import org.keycloak.testframework.infinispan.CacheType; import org.keycloak.testframework.logging.JBossLogConsumer; + +import org.infinispan.server.test.core.CountdownLatchLoggingConsumer; +import org.jboss.logging.Logger; import org.testcontainers.images.RemoteDockerImage; import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.LazyFuture; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/CoreTestFrameworkExtension.java b/test-framework/core/src/main/java/org/keycloak/testframework/CoreTestFrameworkExtension.java index 0ae2974e8a9..eafe859efd5 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/CoreTestFrameworkExtension.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/CoreTestFrameworkExtension.java @@ -1,22 +1,25 @@ package org.keycloak.testframework; +import java.util.List; +import java.util.Map; + import org.keycloak.testframework.admin.AdminClientFactorySupplier; import org.keycloak.testframework.admin.AdminClientSupplier; import org.keycloak.testframework.crypto.CryptoHelper; import org.keycloak.testframework.crypto.CryptoHelperSupplier; -import org.keycloak.testframework.database.RemoteDatabaseSupplier; -import org.keycloak.testframework.http.SimpleHttpSupplier; -import org.keycloak.testframework.https.ManagedCertificates; -import org.keycloak.testframework.infinispan.InfinispanExternalServerSupplier; import org.keycloak.testframework.database.DevFileDatabaseSupplier; import org.keycloak.testframework.database.DevMemDatabaseSupplier; +import org.keycloak.testframework.database.RemoteDatabaseSupplier; import org.keycloak.testframework.database.TestDatabase; import org.keycloak.testframework.events.AdminEventsSupplier; import org.keycloak.testframework.events.EventsSupplier; import org.keycloak.testframework.events.SysLogServerSupplier; import org.keycloak.testframework.http.HttpClientSupplier; import org.keycloak.testframework.http.HttpServerSupplier; +import org.keycloak.testframework.http.SimpleHttpSupplier; import org.keycloak.testframework.https.CertificatesSupplier; +import org.keycloak.testframework.https.ManagedCertificates; +import org.keycloak.testframework.infinispan.InfinispanExternalServerSupplier; import org.keycloak.testframework.injection.Supplier; import org.keycloak.testframework.realm.ClientSupplier; import org.keycloak.testframework.realm.RealmSupplier; @@ -27,9 +30,6 @@ import org.keycloak.testframework.server.KeycloakServer; import org.keycloak.testframework.server.KeycloakUrlsSupplier; import org.keycloak.testframework.server.RemoteKeycloakServerSupplier; -import java.util.List; -import java.util.Map; - public class CoreTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/KeycloakIntegrationTestExtension.java b/test-framework/core/src/main/java/org/keycloak/testframework/KeycloakIntegrationTestExtension.java index f77cb629843..ebc6035ded7 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/KeycloakIntegrationTestExtension.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/KeycloakIntegrationTestExtension.java @@ -1,15 +1,16 @@ package org.keycloak.testframework; +import java.util.Optional; + +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.keycloak.testframework.injection.Registry; + import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.AfterEachCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.BeforeEachCallback; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.TestWatcher; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import org.keycloak.testframework.injection.Registry; - -import java.util.Optional; public class KeycloakIntegrationTestExtension implements BeforeAllCallback, BeforeEachCallback, AfterEachCallback, AfterAllCallback, TestWatcher { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/LogHandler.java b/test-framework/core/src/main/java/org/keycloak/testframework/LogHandler.java index 0cfe91f3709..d65d3abbf3f 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/LogHandler.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/LogHandler.java @@ -1,15 +1,16 @@ package org.keycloak.testframework; +import java.util.logging.Filter; +import java.util.logging.Handler; + +import org.keycloak.testframework.config.Config; + import io.quarkus.runtime.logging.LoggingSetupRecorder; import io.smallrye.config.SmallRyeConfigProviderResolver; import org.eclipse.microprofile.config.spi.ConfigProviderResolver; import org.jboss.logging.Logger; import org.jboss.logmanager.LogManager; import org.junit.jupiter.api.extension.ExtensionContext; -import org.keycloak.testframework.config.Config; - -import java.util.logging.Filter; -import java.util.logging.Handler; public class LogHandler { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/TestFrameworkExtension.java b/test-framework/core/src/main/java/org/keycloak/testframework/TestFrameworkExtension.java index b29f05ab053..3a793af0214 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/TestFrameworkExtension.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/TestFrameworkExtension.java @@ -1,11 +1,11 @@ package org.keycloak.testframework; -import org.keycloak.testframework.injection.Supplier; - import java.util.Collections; import java.util.List; import java.util.Map; +import org.keycloak.testframework.injection.Supplier; + public interface TestFrameworkExtension { List> suppliers(); diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/admin/AdminClientFactory.java b/test-framework/core/src/main/java/org/keycloak/testframework/admin/AdminClientFactory.java index e7287e0968d..9384326e91e 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/admin/AdminClientFactory.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/admin/AdminClientFactory.java @@ -1,12 +1,12 @@ package org.keycloak.testframework.admin; -import org.keycloak.admin.client.Keycloak; -import org.keycloak.admin.client.KeycloakBuilder; - -import javax.net.ssl.SSLContext; import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; +import javax.net.ssl.SSLContext; + +import org.keycloak.admin.client.Keycloak; +import org.keycloak.admin.client.KeycloakBuilder; public class AdminClientFactory { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/admin/AdminClientFactorySupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/admin/AdminClientFactorySupplier.java index 124d5522fdf..4c8de25afe3 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/admin/AdminClientFactorySupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/admin/AdminClientFactorySupplier.java @@ -1,5 +1,7 @@ package org.keycloak.testframework.admin; +import javax.net.ssl.SSLContext; + import org.keycloak.testframework.annotations.InjectAdminClientFactory; import org.keycloak.testframework.https.ManagedCertificates; import org.keycloak.testframework.injection.InstanceContext; @@ -7,8 +9,6 @@ import org.keycloak.testframework.injection.RequestedInstance; import org.keycloak.testframework.injection.Supplier; import org.keycloak.testframework.server.KeycloakServer; -import javax.net.ssl.SSLContext; - public class AdminClientFactorySupplier implements Supplier { @Override diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectAdminClientFactory.java b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectAdminClientFactory.java index adcb5f12a6f..03b4a432faf 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectAdminClientFactory.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectAdminClientFactory.java @@ -1,13 +1,13 @@ package org.keycloak.testframework.annotations; -import org.keycloak.testframework.injection.LifeCycle; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.injection.LifeCycle; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface InjectAdminClientFactory { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectClient.java b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectClient.java index 32596e735be..96d8386d99e 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectClient.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectClient.java @@ -1,14 +1,14 @@ package org.keycloak.testframework.annotations; -import org.keycloak.testframework.injection.LifeCycle; -import org.keycloak.testframework.realm.ClientConfig; -import org.keycloak.testframework.realm.DefaultClientConfig; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.injection.LifeCycle; +import org.keycloak.testframework.realm.ClientConfig; +import org.keycloak.testframework.realm.DefaultClientConfig; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface InjectClient { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectInfinispanServer.java b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectInfinispanServer.java index e1cc029173c..a68f1633181 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectInfinispanServer.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectInfinispanServer.java @@ -1,12 +1,12 @@ package org.keycloak.testframework.annotations; -import org.keycloak.testframework.injection.LifeCycle; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.injection.LifeCycle; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface InjectInfinispanServer { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectRealm.java b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectRealm.java index c9c645b6ced..a4d983842a2 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectRealm.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectRealm.java @@ -1,14 +1,14 @@ package org.keycloak.testframework.annotations; -import org.keycloak.testframework.injection.LifeCycle; -import org.keycloak.testframework.realm.DefaultRealmConfig; -import org.keycloak.testframework.realm.RealmConfig; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.injection.LifeCycle; +import org.keycloak.testframework.realm.DefaultRealmConfig; +import org.keycloak.testframework.realm.RealmConfig; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface InjectRealm { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectTestDatabase.java b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectTestDatabase.java index 75047c8d7bc..119c4f105d8 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectTestDatabase.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectTestDatabase.java @@ -1,14 +1,14 @@ package org.keycloak.testframework.annotations; -import org.keycloak.testframework.database.DatabaseConfig; -import org.keycloak.testframework.database.DefaultDatabaseConfig; -import org.keycloak.testframework.injection.LifeCycle; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.database.DatabaseConfig; +import org.keycloak.testframework.database.DefaultDatabaseConfig; +import org.keycloak.testframework.injection.LifeCycle; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface InjectTestDatabase { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectUser.java b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectUser.java index 3c1c1329804..40a785995d0 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectUser.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/InjectUser.java @@ -1,14 +1,14 @@ package org.keycloak.testframework.annotations; -import org.keycloak.testframework.injection.LifeCycle; -import org.keycloak.testframework.realm.DefaultUserConfig; -import org.keycloak.testframework.realm.UserConfig; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.injection.LifeCycle; +import org.keycloak.testframework.realm.DefaultUserConfig; +import org.keycloak.testframework.realm.UserConfig; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface InjectUser { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/KeycloakIntegrationTest.java b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/KeycloakIntegrationTest.java index 6243967a603..b3b0c811e39 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/annotations/KeycloakIntegrationTest.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/annotations/KeycloakIntegrationTest.java @@ -1,13 +1,13 @@ package org.keycloak.testframework.annotations; -import org.keycloak.testframework.server.DefaultKeycloakServerConfig; -import org.keycloak.testframework.server.KeycloakServerConfig; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.server.DefaultKeycloakServerConfig; +import org.keycloak.testframework.server.KeycloakServerConfig; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface KeycloakIntegrationTest { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/conditions/AbstractDisabledForSupplierCondition.java b/test-framework/core/src/main/java/org/keycloak/testframework/conditions/AbstractDisabledForSupplierCondition.java index c1c70b48b8e..83571ea563b 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/conditions/AbstractDisabledForSupplierCondition.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/conditions/AbstractDisabledForSupplierCondition.java @@ -1,14 +1,15 @@ package org.keycloak.testframework.conditions; -import org.junit.jupiter.api.extension.ConditionEvaluationResult; -import org.junit.jupiter.api.extension.ExecutionCondition; -import org.junit.jupiter.api.extension.ExtensionContext; +import java.lang.annotation.Annotation; +import java.util.Arrays; + import org.keycloak.testframework.injection.Extensions; import org.keycloak.testframework.injection.Supplier; import org.keycloak.testframework.injection.SupplierHelpers; -import java.lang.annotation.Annotation; -import java.util.Arrays; +import org.junit.jupiter.api.extension.ConditionEvaluationResult; +import org.junit.jupiter.api.extension.ExecutionCondition; +import org.junit.jupiter.api.extension.ExtensionContext; abstract class AbstractDisabledForSupplierCondition implements ExecutionCondition { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForDatabases.java b/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForDatabases.java index 2ea8c787fa2..2b7f83ddc8e 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForDatabases.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForDatabases.java @@ -1,13 +1,13 @@ package org.keycloak.testframework.conditions; -import org.junit.jupiter.api.extension.ExtendWith; - import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.junit.jupiter.api.extension.ExtendWith; + @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForDatabasesCondition.java b/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForDatabasesCondition.java index 04220cd7f45..facc6481461 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForDatabasesCondition.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForDatabasesCondition.java @@ -1,9 +1,9 @@ package org.keycloak.testframework.conditions; -import org.keycloak.testframework.database.TestDatabase; - import java.lang.annotation.Annotation; +import org.keycloak.testframework.database.TestDatabase; + class DisabledForDatabasesCondition extends AbstractDisabledForSupplierCondition { @Override diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForServers.java b/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForServers.java index dfbd2e31c87..cb76ba398dc 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForServers.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForServers.java @@ -1,13 +1,13 @@ package org.keycloak.testframework.conditions; -import org.junit.jupiter.api.extension.ExtendWith; - import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.junit.jupiter.api.extension.ExtendWith; + @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForServersCondition.java b/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForServersCondition.java index fbf2d0f572e..abf17205a26 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForServersCondition.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/conditions/DisabledForServersCondition.java @@ -1,9 +1,9 @@ package org.keycloak.testframework.conditions; -import org.keycloak.testframework.server.KeycloakServer; - import java.lang.annotation.Annotation; +import org.keycloak.testframework.server.KeycloakServer; + class DisabledForServersCondition extends AbstractDisabledForSupplierCondition { @Override diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/config/Config.java b/test-framework/core/src/main/java/org/keycloak/testframework/config/Config.java index 24774328e12..1fd01a5bdf2 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/config/Config.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/config/Config.java @@ -1,5 +1,15 @@ package org.keycloak.testframework.config; +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Optional; + +import org.keycloak.testframework.injection.ValueTypeAlias; + import io.quarkus.runtime.configuration.CharsetConverter; import io.quarkus.runtime.configuration.InetSocketAddressConverter; import io.quarkus.runtime.configuration.MemorySizeConverter; @@ -11,15 +21,6 @@ import io.smallrye.config.common.utils.ConfigSourceUtil; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.config.spi.ConfigSource; import org.eclipse.microprofile.config.spi.Converter; -import org.keycloak.testframework.injection.ValueTypeAlias; - -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Optional; public class Config { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/config/LogConfigInterceptor.java b/test-framework/core/src/main/java/org/keycloak/testframework/config/LogConfigInterceptor.java index 660e8b00be9..961cb6d25d1 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/config/LogConfigInterceptor.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/config/LogConfigInterceptor.java @@ -1,13 +1,13 @@ package org.keycloak.testframework.config; -import io.smallrye.config.ConfigSourceInterceptor; -import io.smallrye.config.ConfigSourceInterceptorContext; -import io.smallrye.config.ConfigValue; - import java.util.Iterator; import java.util.Map; import java.util.Set; +import io.smallrye.config.ConfigSourceInterceptor; +import io.smallrye.config.ConfigSourceInterceptorContext; +import io.smallrye.config.ConfigValue; + public class LogConfigInterceptor implements ConfigSourceInterceptor { private static final Map MAPPED = Map.of("quarkus.console.color", "kc.test.console.color"); diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/config/SuiteConfigSource.java b/test-framework/core/src/main/java/org/keycloak/testframework/config/SuiteConfigSource.java index a61fe56d1c9..8ad34582a4c 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/config/SuiteConfigSource.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/config/SuiteConfigSource.java @@ -1,11 +1,11 @@ package org.keycloak.testframework.config; -import org.eclipse.microprofile.config.spi.ConfigSource; - import java.util.HashMap; import java.util.Map; import java.util.Set; +import org.eclipse.microprofile.config.spi.ConfigSource; + public class SuiteConfigSource implements ConfigSource { private static final Map SUITE_CONFIG = new HashMap<>(); diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/crypto/CryptoKeyStore.java b/test-framework/core/src/main/java/org/keycloak/testframework/crypto/CryptoKeyStore.java index d29faf7390b..2f5ff0d721e 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/crypto/CryptoKeyStore.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/crypto/CryptoKeyStore.java @@ -19,16 +19,6 @@ package org.keycloak.testframework.crypto; -import org.junit.jupiter.api.Assumptions; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.CertificateUtils; -import org.keycloak.common.util.KeyUtils; -import org.keycloak.common.util.KeystoreUtil; -import org.keycloak.common.util.PemUtils; -import org.keycloak.common.util.Time; -import org.keycloak.representations.idm.CertificateRepresentation; - -import javax.crypto.SecretKey; import java.io.File; import java.io.FileOutputStream; import java.security.KeyPair; @@ -38,6 +28,17 @@ import java.security.cert.Certificate; import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.stream.Stream; +import javax.crypto.SecretKey; + +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.CertificateUtils; +import org.keycloak.common.util.KeyUtils; +import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.common.util.PemUtils; +import org.keycloak.common.util.Time; +import org.keycloak.representations.idm.CertificateRepresentation; + +import org.junit.jupiter.api.Assumptions; /** * @author Marek Posolda diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/crypto/KeystoreInfo.java b/test-framework/core/src/main/java/org/keycloak/testframework/crypto/KeystoreInfo.java index a0a949fbefb..384aa67ede9 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/crypto/KeystoreInfo.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/crypto/KeystoreInfo.java @@ -1,9 +1,9 @@ package org.keycloak.testframework.crypto; -import org.keycloak.representations.idm.CertificateRepresentation; - import java.io.File; +import org.keycloak.representations.idm.CertificateRepresentation; + public class KeystoreInfo { private final CertificateRepresentation certificateInfo; private final File keystoreFile; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/database/AbstractContainerTestDatabase.java b/test-framework/core/src/main/java/org/keycloak/testframework/database/AbstractContainerTestDatabase.java index 95611ea4ef9..ce8bb111f25 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/database/AbstractContainerTestDatabase.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/database/AbstractContainerTestDatabase.java @@ -5,9 +5,10 @@ import java.time.Duration; import java.util.List; import java.util.Map; -import org.jboss.logging.Logger; import org.keycloak.testframework.config.Config; import org.keycloak.testframework.logging.JBossLogConsumer; + +import org.jboss.logging.Logger; import org.testcontainers.containers.JdbcDatabaseContainer; public abstract class AbstractContainerTestDatabase implements TestDatabase { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/database/RemoteTestDatabase.java b/test-framework/core/src/main/java/org/keycloak/testframework/database/RemoteTestDatabase.java index 73072f78ac4..593feeb15f7 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/database/RemoteTestDatabase.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/database/RemoteTestDatabase.java @@ -1,11 +1,11 @@ package org.keycloak.testframework.database; -import org.keycloak.testframework.config.Config; - import java.util.HashMap; import java.util.Map; import java.util.NoSuchElementException; +import org.keycloak.testframework.config.Config; + public class RemoteTestDatabase implements TestDatabase { @Override diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/events/AbstractEvents.java b/test-framework/core/src/main/java/org/keycloak/testframework/events/AbstractEvents.java index f550423e426..e4a56c459ef 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/events/AbstractEvents.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/events/AbstractEvents.java @@ -1,10 +1,5 @@ package org.keycloak.testframework.events; -import org.jboss.logging.Logger; -import org.junit.jupiter.api.Assertions; -import org.keycloak.common.util.Time; -import org.keycloak.testframework.realm.ManagedRealm; - import java.text.SimpleDateFormat; import java.util.HashSet; import java.util.LinkedList; @@ -12,6 +7,12 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; +import org.keycloak.common.util.Time; +import org.keycloak.testframework.realm.ManagedRealm; + +import org.jboss.logging.Logger; +import org.junit.jupiter.api.Assertions; + public abstract class AbstractEvents { protected final ManagedRealm realm; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/events/AbstractEventsSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/events/AbstractEventsSupplier.java index c435df8da3d..0bffc3c8780 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/events/AbstractEventsSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/events/AbstractEventsSupplier.java @@ -1,5 +1,7 @@ package org.keycloak.testframework.events; +import java.lang.annotation.Annotation; + import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.injection.RequestedInstance; @@ -8,8 +10,6 @@ import org.keycloak.testframework.injection.SupplierHelpers; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfigInterceptor; -import java.lang.annotation.Annotation; - @SuppressWarnings("rawtypes") public abstract class AbstractEventsSupplier implements Supplier, RealmConfigInterceptor { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEventAssertion.java b/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEventAssertion.java index f12b9b76fd4..f2d6293f791 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEventAssertion.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEventAssertion.java @@ -1,8 +1,12 @@ package org.keycloak.testframework.events; -import com.fasterxml.jackson.core.type.TypeReference; -import org.hamcrest.MatcherAssert; -import org.junit.jupiter.api.Assertions; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.common.util.reflections.Reflections; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -11,12 +15,9 @@ import org.keycloak.representations.idm.AuthDetailsRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.core.type.TypeReference; +import org.hamcrest.MatcherAssert; +import org.junit.jupiter.api.Assertions; public class AdminEventAssertion { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEvents.java b/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEvents.java index d175bcb67a2..ee03f3615fc 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEvents.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEvents.java @@ -1,10 +1,11 @@ package org.keycloak.testframework.events; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.representations.idm.AdminEventRepresentation; import org.keycloak.testframework.realm.ManagedRealm; -import java.util.List; +import org.jboss.logging.Logger; public class AdminEvents extends AbstractEvents { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEventsParser.java b/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEventsParser.java index ba6ae9bde7c..bf0dc814464 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEventsParser.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/events/AdminEventsParser.java @@ -1,13 +1,13 @@ package org.keycloak.testframework.events; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.events.admin.AdminEvent; import org.keycloak.events.admin.AuthDetails; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; -import java.util.HashMap; -import java.util.Map; - public class AdminEventsParser { private AdminEventsParser() { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/events/EventAssertion.java b/test-framework/core/src/main/java/org/keycloak/testframework/events/EventAssertion.java index 83cc2ef9ec5..18c2ca716f0 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/events/EventAssertion.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/events/EventAssertion.java @@ -1,10 +1,11 @@ package org.keycloak.testframework.events; +import org.keycloak.events.EventType; +import org.keycloak.representations.idm.EventRepresentation; + import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; -import org.keycloak.events.EventType; -import org.keycloak.representations.idm.EventRepresentation; public class EventAssertion { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/events/EventMatchers.java b/test-framework/core/src/main/java/org/keycloak/testframework/events/EventMatchers.java index 5804c8dfc6e..4fb696505aa 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/events/EventMatchers.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/events/EventMatchers.java @@ -1,13 +1,13 @@ package org.keycloak.testframework.events; +import java.util.UUID; +import java.util.regex.Pattern; + import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.Matchers; import org.hamcrest.TypeSafeMatcher; -import java.util.UUID; -import java.util.regex.Pattern; - public class EventMatchers { public static Matcher isUUID() { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/events/EventParser.java b/test-framework/core/src/main/java/org/keycloak/testframework/events/EventParser.java index 5eb1c596469..bef248e850a 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/events/EventParser.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/events/EventParser.java @@ -1,11 +1,11 @@ package org.keycloak.testframework.events; -import org.keycloak.events.Event; -import org.keycloak.events.EventType; - import java.util.HashMap; import java.util.Map; +import org.keycloak.events.Event; +import org.keycloak.events.EventType; + public class EventParser { private EventParser() { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/events/Events.java b/test-framework/core/src/main/java/org/keycloak/testframework/events/Events.java index e831ba42849..b8e9aae1602 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/events/Events.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/events/Events.java @@ -1,10 +1,11 @@ package org.keycloak.testframework.events; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.testframework.realm.ManagedRealm; -import java.util.List; +import org.jboss.logging.Logger; public class Events extends AbstractEvents { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/events/SysLogServer.java b/test-framework/core/src/main/java/org/keycloak/testframework/events/SysLogServer.java index 07a77092caf..4e38c6e630e 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/events/SysLogServer.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/events/SysLogServer.java @@ -1,7 +1,5 @@ package org.keycloak.testframework.events; -import org.jboss.logging.Logger; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -13,6 +11,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; +import org.jboss.logging.Logger; + public class SysLogServer { private static final Logger LOGGER = Logger.getLogger(SysLogServer.class); diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/events/SysLogServerSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/events/SysLogServerSupplier.java index 281db62fdbb..e2bb31d5e82 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/events/SysLogServerSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/events/SysLogServerSupplier.java @@ -1,5 +1,7 @@ package org.keycloak.testframework.events; +import java.io.IOException; + import org.keycloak.testframework.annotations.InjectSysLogServer; import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.LifeCycle; @@ -9,8 +11,6 @@ import org.keycloak.testframework.injection.SupplierOrder; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.testframework.server.KeycloakServerConfigInterceptor; -import java.io.IOException; - public class SysLogServerSupplier implements Supplier, KeycloakServerConfigInterceptor { @Override diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/http/HttpClientSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/http/HttpClientSupplier.java index 7ffaea65b3c..317cfd5694b 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/http/HttpClientSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/http/HttpClientSupplier.java @@ -1,9 +1,8 @@ package org.keycloak.testframework.http; -import org.apache.http.client.HttpClient; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; +import java.io.IOException; +import javax.net.ssl.SSLContext; + import org.keycloak.testframework.annotations.InjectHttpClient; import org.keycloak.testframework.https.ManagedCertificates; import org.keycloak.testframework.injection.InstanceContext; @@ -12,8 +11,10 @@ import org.keycloak.testframework.injection.RequestedInstance; import org.keycloak.testframework.injection.Supplier; import org.keycloak.testframework.server.KeycloakServer; -import javax.net.ssl.SSLContext; -import java.io.IOException; +import org.apache.http.client.HttpClient; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; public class HttpClientSupplier implements Supplier { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/http/HttpServerSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/http/HttpServerSupplier.java index 38954da5558..e667c4f09c6 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/http/HttpServerSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/http/HttpServerSupplier.java @@ -1,14 +1,15 @@ package org.keycloak.testframework.http; -import com.sun.net.httpserver.HttpServer; +import java.io.IOException; +import java.net.InetSocketAddress; + import org.keycloak.testframework.annotations.InjectHttpServer; import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.injection.RequestedInstance; import org.keycloak.testframework.injection.Supplier; -import java.io.IOException; -import java.net.InetSocketAddress; +import com.sun.net.httpserver.HttpServer; public class HttpServerSupplier implements Supplier { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/http/SimpleHttpSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/http/SimpleHttpSupplier.java index 03aebbd556c..8914e6a3708 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/http/SimpleHttpSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/http/SimpleHttpSupplier.java @@ -1,12 +1,13 @@ package org.keycloak.testframework.http; -import org.apache.http.client.HttpClient; import org.keycloak.http.simple.SimpleHttp; import org.keycloak.testframework.annotations.InjectSimpleHttp; import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.RequestedInstance; import org.keycloak.testframework.injection.Supplier; +import org.apache.http.client.HttpClient; + public class SimpleHttpSupplier implements Supplier { @Override diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/https/ManagedCertificates.java b/test-framework/core/src/main/java/org/keycloak/testframework/https/ManagedCertificates.java index 1369f6448af..4fcbd048d9f 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/https/ManagedCertificates.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/https/ManagedCertificates.java @@ -1,13 +1,5 @@ package org.keycloak.testframework.https; -import org.apache.http.ssl.SSLContextBuilder; -import org.jboss.logging.Logger; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.crypto.CryptoProvider; -import org.keycloak.common.util.KeystoreUtil; -import org.keycloak.crypto.def.DefaultCryptoProvider; - -import javax.net.ssl.SSLContext; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; @@ -21,6 +13,15 @@ import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; +import javax.net.ssl.SSLContext; + +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.crypto.CryptoProvider; +import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.crypto.def.DefaultCryptoProvider; + +import org.apache.http.ssl.SSLContextBuilder; +import org.jboss.logging.Logger; public class ManagedCertificates { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServer.java b/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServer.java index c845e329044..b21b5142b59 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServer.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServer.java @@ -2,11 +2,12 @@ package org.keycloak.testframework.infinispan; import java.util.Map; -import org.infinispan.server.test.core.InfinispanContainer; -import org.jboss.logging.Logger; import org.keycloak.testframework.logging.JBossLogConsumer; import org.keycloak.testframework.util.ContainerImages; +import org.infinispan.server.test.core.InfinispanContainer; +import org.jboss.logging.Logger; + public class InfinispanExternalServer extends InfinispanContainer implements InfinispanServer { private static final String USER = "keycloak"; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServerSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServerSupplier.java index b3b3cf27c29..e378353e426 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServerSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/infinispan/InfinispanExternalServerSupplier.java @@ -1,6 +1,5 @@ package org.keycloak.testframework.infinispan; -import org.jboss.logging.Logger; import org.keycloak.testframework.annotations.InjectInfinispanServer; import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.RequestedInstance; @@ -9,6 +8,8 @@ import org.keycloak.testframework.injection.SupplierOrder; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.testframework.server.KeycloakServerConfigInterceptor; +import org.jboss.logging.Logger; + public class InfinispanExternalServerSupplier implements Supplier, KeycloakServerConfigInterceptor { private static final Logger LOGGER = Logger.getLogger(InfinispanExternalServerSupplier.class); diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/injection/Extensions.java b/test-framework/core/src/main/java/org/keycloak/testframework/injection/Extensions.java index 1a735b18fe5..ab0840e1841 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/injection/Extensions.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/injection/Extensions.java @@ -1,9 +1,5 @@ package org.keycloak.testframework.injection; -import org.eclipse.microprofile.config.inject.ConfigProperty; -import org.keycloak.testframework.TestFrameworkExtension; -import org.keycloak.testframework.config.Config; - import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.util.Arrays; @@ -13,6 +9,11 @@ import java.util.List; import java.util.ServiceLoader; import java.util.Set; +import org.keycloak.testframework.TestFrameworkExtension; +import org.keycloak.testframework.config.Config; + +import org.eclipse.microprofile.config.inject.ConfigProperty; + public class Extensions { private final RegistryLogger logger; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/injection/Registry.java b/test-framework/core/src/main/java/org/keycloak/testframework/injection/Registry.java index a9b1eba34b7..d8b2f9d8db5 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/injection/Registry.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/injection/Registry.java @@ -1,7 +1,5 @@ package org.keycloak.testframework.injection; -import org.junit.jupiter.api.extension.ExtensionContext; - import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.util.Comparator; @@ -11,6 +9,8 @@ import java.util.List; import java.util.Objects; import java.util.Set; +import org.junit.jupiter.api.extension.ExtensionContext; + @SuppressWarnings({"rawtypes", "unchecked"}) public class Registry implements ExtensionContext.Store.CloseableResource { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/injection/RegistryLogger.java b/test-framework/core/src/main/java/org/keycloak/testframework/injection/RegistryLogger.java index df0406b28d2..c9801f487c8 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/injection/RegistryLogger.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/injection/RegistryLogger.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.injection; -import org.jboss.logging.Logger; - import java.util.List; import java.util.stream.Collectors; +import org.jboss.logging.Logger; + @SuppressWarnings("rawtypes") class RegistryLogger { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/logging/JBossLogConsumer.java b/test-framework/core/src/main/java/org/keycloak/testframework/logging/JBossLogConsumer.java index 12ea46ebfa3..5f659cff054 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/logging/JBossLogConsumer.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/logging/JBossLogConsumer.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.logging; +import java.util.function.Consumer; + import org.jboss.logging.Logger; import org.testcontainers.containers.output.OutputFrame; -import java.util.function.Consumer; - public class JBossLogConsumer implements Consumer { private final Logger logger; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientConfigBuilder.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientConfigBuilder.java index 6d08c852939..72408cd2d8d 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientConfigBuilder.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientConfigBuilder.java @@ -1,12 +1,12 @@ package org.keycloak.testframework.realm; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.ProtocolMapperRepresentation; - import java.util.Arrays; import java.util.HashMap; import java.util.List; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.ProtocolMapperRepresentation; + public class ClientConfigBuilder { private final ClientRepresentation rep; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientSupplier.java index f8b4cf7f4ab..4bc5c450b58 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ClientSupplier.java @@ -1,10 +1,11 @@ package org.keycloak.testframework.realm; -import jakarta.ws.rs.NotFoundException; import java.util.List; +import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testframework.annotations.InjectClient; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/GroupConfigBuilder.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/GroupConfigBuilder.java index bb132366a52..3277f80a1a5 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/GroupConfigBuilder.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/GroupConfigBuilder.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.realm; -import org.keycloak.representations.idm.GroupRepresentation; - import java.util.List; import java.util.Map; +import org.keycloak.representations.idm.GroupRepresentation; + public class GroupConfigBuilder { private final GroupRepresentation rep; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedClientCleanup.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedClientCleanup.java index ac871ee2456..42b67479931 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedClientCleanup.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedClientCleanup.java @@ -1,11 +1,11 @@ package org.keycloak.testframework.realm; -import org.keycloak.admin.client.resource.ClientResource; -import org.keycloak.representations.idm.ClientRepresentation; - import java.util.LinkedList; import java.util.List; +import org.keycloak.admin.client.resource.ClientResource; +import org.keycloak.representations.idm.ClientRepresentation; + public class ManagedClientCleanup { private final List cleanupTasks = new LinkedList<>(); diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedRealmCleanup.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedRealmCleanup.java index 79fdc553b59..86a80d06969 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedRealmCleanup.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedRealmCleanup.java @@ -1,11 +1,11 @@ package org.keycloak.testframework.realm; -import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.representations.idm.RealmRepresentation; - import java.util.LinkedList; import java.util.List; +import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.representations.idm.RealmRepresentation; + public class ManagedRealmCleanup { private final List cleanupTasks = new LinkedList<>(); diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedUser.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedUser.java index e563ef0fba4..50447fc17df 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedUser.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/ManagedUser.java @@ -1,11 +1,11 @@ package org.keycloak.testframework.realm; +import java.util.Optional; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import java.util.Optional; - public class ManagedUser { private final UserRepresentation createdRepresentation; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmConfigBuilder.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmConfigBuilder.java index 9c1c6b24cf0..23859dc2a34 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmConfigBuilder.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmConfigBuilder.java @@ -1,5 +1,10 @@ package org.keycloak.testframework.realm; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; @@ -8,11 +13,6 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.RolesRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - public class RealmConfigBuilder { private final RealmRepresentation rep; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmConfigInterceptor.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmConfigInterceptor.java index 6b54dba3f6d..c493f48b467 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmConfigInterceptor.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmConfigInterceptor.java @@ -1,9 +1,9 @@ package org.keycloak.testframework.realm; -import org.keycloak.testframework.injection.InstanceContext; - import java.lang.annotation.Annotation; +import org.keycloak.testframework.injection.InstanceContext; + public interface RealmConfigInterceptor { RealmConfigBuilder intercept(RealmConfigBuilder realm, InstanceContext instanceContext); diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmSupplier.java index e0cc863833d..cc0d413a2fb 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/RealmSupplier.java @@ -4,13 +4,13 @@ import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testframework.annotations.InjectRealm; +import org.keycloak.testframework.injection.AbstractInterceptorHelper; import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.Registry; import org.keycloak.testframework.injection.RequestedInstance; import org.keycloak.testframework.injection.Supplier; import org.keycloak.testframework.injection.SupplierHelpers; import org.keycloak.testframework.injection.SupplierOrder; -import org.keycloak.testframework.injection.AbstractInterceptorHelper; import org.keycloak.testframework.server.KeycloakServer; public class RealmSupplier implements Supplier { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/RoleConfigBuilder.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/RoleConfigBuilder.java index 27fd4f1b3af..348bad94e9c 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/RoleConfigBuilder.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/RoleConfigBuilder.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.realm; -import org.keycloak.representations.idm.RoleRepresentation; - import java.util.List; import java.util.Map; +import org.keycloak.representations.idm.RoleRepresentation; + public class RoleConfigBuilder { private final RoleRepresentation rep; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserConfigBuilder.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserConfigBuilder.java index 860f6c30b33..4836efdfd33 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserConfigBuilder.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserConfigBuilder.java @@ -1,5 +1,9 @@ package org.keycloak.testframework.realm; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.models.utils.HmacOTP; import org.keycloak.models.utils.ModelToRepresentation; @@ -7,10 +11,6 @@ import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.FederatedIdentityRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - public class UserConfigBuilder { private final UserRepresentation rep; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserSupplier.java index 57795df0c34..c3c002dfeb6 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/realm/UserSupplier.java @@ -3,6 +3,7 @@ package org.keycloak.testframework.realm; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testframework.annotations.InjectUser; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/server/AbstractKeycloakServerSupplier.java b/test-framework/core/src/main/java/org/keycloak/testframework/server/AbstractKeycloakServerSupplier.java index 7073904f19b..fa5380b9bf2 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/server/AbstractKeycloakServerSupplier.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/server/AbstractKeycloakServerSupplier.java @@ -1,6 +1,5 @@ package org.keycloak.testframework.server; -import org.jboss.logging.Logger; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.config.Config; import org.keycloak.testframework.database.TestDatabase; @@ -15,6 +14,8 @@ import org.keycloak.testframework.injection.Supplier; import org.keycloak.testframework.injection.SupplierHelpers; import org.keycloak.testframework.injection.SupplierOrder; +import org.jboss.logging.Logger; + public abstract class AbstractKeycloakServerSupplier implements Supplier { @Override diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/server/DistributionKeycloakServer.java b/test-framework/core/src/main/java/org/keycloak/testframework/server/DistributionKeycloakServer.java index 98553c655fd..9d108cfd96f 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/server/DistributionKeycloakServer.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/server/DistributionKeycloakServer.java @@ -1,16 +1,17 @@ package org.keycloak.testframework.server; -import io.quarkus.maven.dependency.Dependency; -import org.jboss.logging.Logger; -import org.keycloak.it.utils.OutputConsumer; -import org.keycloak.it.utils.RawKeycloakDistribution; - import java.nio.file.Path; import java.util.Collections; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.keycloak.it.utils.OutputConsumer; +import org.keycloak.it.utils.RawKeycloakDistribution; + +import io.quarkus.maven.dependency.Dependency; +import org.jboss.logging.Logger; + public class DistributionKeycloakServer implements KeycloakServer { private static final boolean MANUAL_STOP = true; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/server/EmbeddedKeycloakServer.java b/test-framework/core/src/main/java/org/keycloak/testframework/server/EmbeddedKeycloakServer.java index 8c10c816135..f34d0b36f66 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/server/EmbeddedKeycloakServer.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/server/EmbeddedKeycloakServer.java @@ -1,16 +1,17 @@ package org.keycloak.testframework.server; -import io.quarkus.maven.dependency.Dependency; -import org.keycloak.Keycloak; -import org.keycloak.common.Version; -import org.keycloak.platform.Platform; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Set; import java.util.concurrent.TimeoutException; +import org.keycloak.Keycloak; +import org.keycloak.common.Version; +import org.keycloak.platform.Platform; + +import io.quarkus.maven.dependency.Dependency; + public class EmbeddedKeycloakServer implements KeycloakServer { private Keycloak keycloak; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigBuilder.java b/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigBuilder.java index e4e7db076c2..4a150eaab69 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigBuilder.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigBuilder.java @@ -1,12 +1,5 @@ package org.keycloak.testframework.server; -import io.quarkus.maven.dependency.Dependency; -import io.quarkus.maven.dependency.DependencyBuilder; -import io.smallrye.config.SmallRyeConfig; -import org.eclipse.microprofile.config.spi.ConfigSource; -import org.keycloak.common.Profile; -import org.keycloak.testframework.infinispan.CacheType; - import java.net.URISyntaxException; import java.nio.file.Path; import java.nio.file.Paths; @@ -20,6 +13,14 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.common.Profile; +import org.keycloak.testframework.infinispan.CacheType; + +import io.quarkus.maven.dependency.Dependency; +import io.quarkus.maven.dependency.DependencyBuilder; +import io.smallrye.config.SmallRyeConfig; +import org.eclipse.microprofile.config.spi.ConfigSource; + public class KeycloakServerConfigBuilder { private static final String SPI_OPTION = "spi-%s--%s--%s"; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigInterceptor.java b/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigInterceptor.java index c44b23e397e..c47d76de6fd 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigInterceptor.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakServerConfigInterceptor.java @@ -1,9 +1,9 @@ package org.keycloak.testframework.server; -import org.keycloak.testframework.injection.InstanceContext; - import java.lang.annotation.Annotation; +import org.keycloak.testframework.injection.InstanceContext; + public interface KeycloakServerConfigInterceptor { KeycloakServerConfigBuilder intercept(KeycloakServerConfigBuilder serverConfig, InstanceContext instanceContext); diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakUrls.java b/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakUrls.java index 8b3258e1424..5825de1b921 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakUrls.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/server/KeycloakUrls.java @@ -1,11 +1,11 @@ package org.keycloak.testframework.server; -import org.keycloak.common.util.KeycloakUriBuilder; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; - import java.net.MalformedURLException; import java.net.URL; +import org.keycloak.common.util.KeycloakUriBuilder; +import org.keycloak.protocol.oidc.OIDCLoginProtocol; + public class KeycloakUrls { private final String baseUrl; diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/server/RemoteKeycloakServer.java b/test-framework/core/src/main/java/org/keycloak/testframework/server/RemoteKeycloakServer.java index 06f9ef8ce26..a9bf219da44 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/server/RemoteKeycloakServer.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/server/RemoteKeycloakServer.java @@ -1,13 +1,13 @@ package org.keycloak.testframework.server; -import io.quarkus.maven.dependency.Dependency; - -import javax.net.ssl.SSLException; import java.net.ConnectException; import java.net.URL; import java.nio.file.Path; import java.util.Set; import java.util.concurrent.TimeUnit; +import javax.net.ssl.SSLException; + +import io.quarkus.maven.dependency.Dependency; public class RemoteKeycloakServer implements KeycloakServer { diff --git a/test-framework/core/src/main/java/org/keycloak/testframework/util/ApiUtil.java b/test-framework/core/src/main/java/org/keycloak/testframework/util/ApiUtil.java index 6c1fed837a5..7e65d2ca9aa 100644 --- a/test-framework/core/src/main/java/org/keycloak/testframework/util/ApiUtil.java +++ b/test-framework/core/src/main/java/org/keycloak/testframework/util/ApiUtil.java @@ -1,6 +1,7 @@ package org.keycloak.testframework.util; import jakarta.ws.rs.core.Response; + import org.junit.jupiter.api.Assertions; public class ApiUtil { diff --git a/test-framework/core/src/test/java/org/keycloak/testframework/events/AdminEventAssertionTest.java b/test-framework/core/src/test/java/org/keycloak/testframework/events/AdminEventAssertionTest.java index 2573dafbf99..a1d9b525a86 100644 --- a/test-framework/core/src/test/java/org/keycloak/testframework/events/AdminEventAssertionTest.java +++ b/test-framework/core/src/test/java/org/keycloak/testframework/events/AdminEventAssertionTest.java @@ -1,15 +1,16 @@ package org.keycloak.testframework.events; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.keycloak.representations.idm.AdminEventRepresentation; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.util.List; import java.util.UUID; +import org.keycloak.representations.idm.AdminEventRepresentation; +import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.util.JsonSerialization; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + public class AdminEventAssertionTest { @Test diff --git a/test-framework/core/src/test/java/org/keycloak/testframework/events/EventParserTest.java b/test-framework/core/src/test/java/org/keycloak/testframework/events/EventParserTest.java index c9a236e71cf..f58f562b7cd 100644 --- a/test-framework/core/src/test/java/org/keycloak/testframework/events/EventParserTest.java +++ b/test-framework/core/src/test/java/org/keycloak/testframework/events/EventParserTest.java @@ -1,8 +1,9 @@ package org.keycloak.testframework.events; +import org.keycloak.events.Event; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.keycloak.events.Event; public class EventParserTest { diff --git a/test-framework/core/src/test/java/org/keycloak/testframework/injection/DefaultAnnotationProxyTest.java b/test-framework/core/src/test/java/org/keycloak/testframework/injection/DefaultAnnotationProxyTest.java index 2b63679f0ef..99a8e0f57c1 100644 --- a/test-framework/core/src/test/java/org/keycloak/testframework/injection/DefaultAnnotationProxyTest.java +++ b/test-framework/core/src/test/java/org/keycloak/testframework/injection/DefaultAnnotationProxyTest.java @@ -1,8 +1,5 @@ package org.keycloak.testframework.injection; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -10,6 +7,9 @@ import java.lang.annotation.Target; import java.util.LinkedList; import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + public class DefaultAnnotationProxyTest { @Test diff --git a/test-framework/core/src/test/java/org/keycloak/testframework/injection/RegistryTest.java b/test-framework/core/src/test/java/org/keycloak/testframework/injection/RegistryTest.java index 245a3437ff2..6878da772fc 100644 --- a/test-framework/core/src/test/java/org/keycloak/testframework/injection/RegistryTest.java +++ b/test-framework/core/src/test/java/org/keycloak/testframework/injection/RegistryTest.java @@ -1,10 +1,7 @@ package org.keycloak.testframework.injection; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import java.util.List; + import org.keycloak.testframework.config.Config; import org.keycloak.testframework.injection.mocks.MockChildAnnotation; import org.keycloak.testframework.injection.mocks.MockChildSupplier; @@ -15,7 +12,11 @@ import org.keycloak.testframework.injection.mocks.MockParentAnnotation; import org.keycloak.testframework.injection.mocks.MockParentSupplier; import org.keycloak.testframework.injection.mocks.MockParentValue; -import java.util.List; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class RegistryTest { diff --git a/test-framework/core/src/test/java/org/keycloak/testframework/injection/ValueTypeAliasTest.java b/test-framework/core/src/test/java/org/keycloak/testframework/injection/ValueTypeAliasTest.java index efbec91f928..359c9f9d028 100644 --- a/test-framework/core/src/test/java/org/keycloak/testframework/injection/ValueTypeAliasTest.java +++ b/test-framework/core/src/test/java/org/keycloak/testframework/injection/ValueTypeAliasTest.java @@ -1,11 +1,12 @@ package org.keycloak.testframework.injection; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.Map; + import org.keycloak.admin.client.Keycloak; import org.keycloak.testframework.server.KeycloakServer; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ValueTypeAliasTest { diff --git a/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockInstances.java b/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockInstances.java index ba723ca5934..b6ac9497c81 100644 --- a/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockInstances.java +++ b/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockInstances.java @@ -1,9 +1,9 @@ package org.keycloak.testframework.injection.mocks; -import io.vertx.core.impl.ConcurrentHashSet; - import java.util.Set; +import io.vertx.core.impl.ConcurrentHashSet; + public class MockInstances { public static final Set INSTANCES = new ConcurrentHashSet<>(); diff --git a/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockParentSupplier.java b/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockParentSupplier.java index 85fd2621260..61657bc621c 100644 --- a/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockParentSupplier.java +++ b/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockParentSupplier.java @@ -1,11 +1,12 @@ package org.keycloak.testframework.injection.mocks; -import org.eclipse.microprofile.config.inject.ConfigProperty; import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.injection.RequestedInstance; import org.keycloak.testframework.injection.Supplier; +import org.eclipse.microprofile.config.inject.ConfigProperty; + public class MockParentSupplier implements Supplier { @ConfigProperty(name = "string") diff --git a/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockTestFrameworkExtension.java b/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockTestFrameworkExtension.java index 39d41d6eb1c..08546f8bfa1 100644 --- a/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockTestFrameworkExtension.java +++ b/test-framework/core/src/test/java/org/keycloak/testframework/injection/mocks/MockTestFrameworkExtension.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.injection.mocks; +import java.util.List; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; -import java.util.List; - public class MockTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/db-edb/src/main/java/org/keycloak/testframework/database/EnterpriseDbTestDatabase.java b/test-framework/db-edb/src/main/java/org/keycloak/testframework/database/EnterpriseDbTestDatabase.java index 1524b5c9ba2..65050e66793 100644 --- a/test-framework/db-edb/src/main/java/org/keycloak/testframework/database/EnterpriseDbTestDatabase.java +++ b/test-framework/db-edb/src/main/java/org/keycloak/testframework/database/EnterpriseDbTestDatabase.java @@ -1,7 +1,8 @@ package org.keycloak.testframework.database; -import org.jboss.logging.Logger; import org.keycloak.testframework.util.ContainerImages; + +import org.jboss.logging.Logger; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.utility.DockerImageName; diff --git a/test-framework/db-edb/src/main/java/org/keycloak/testframework/database/EnterpriseDbTestFrameworkExtension.java b/test-framework/db-edb/src/main/java/org/keycloak/testframework/database/EnterpriseDbTestFrameworkExtension.java index 4fd6449474e..f0fcccafe67 100644 --- a/test-framework/db-edb/src/main/java/org/keycloak/testframework/database/EnterpriseDbTestFrameworkExtension.java +++ b/test-framework/db-edb/src/main/java/org/keycloak/testframework/database/EnterpriseDbTestFrameworkExtension.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.database; +import java.util.List; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; -import java.util.List; - public class EnterpriseDbTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/db-mariadb/src/main/java/org/keycloak/testframework/database/MariaDBTestDatabase.java b/test-framework/db-mariadb/src/main/java/org/keycloak/testframework/database/MariaDBTestDatabase.java index 3e547e7c973..81a6e0fe322 100644 --- a/test-framework/db-mariadb/src/main/java/org/keycloak/testframework/database/MariaDBTestDatabase.java +++ b/test-framework/db-mariadb/src/main/java/org/keycloak/testframework/database/MariaDBTestDatabase.java @@ -1,7 +1,8 @@ package org.keycloak.testframework.database; -import org.jboss.logging.Logger; import org.keycloak.testframework.util.ContainerImages; + +import org.jboss.logging.Logger; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.containers.MariaDBContainer; import org.testcontainers.utility.DockerImageName; diff --git a/test-framework/db-mariadb/src/main/java/org/keycloak/testframework/database/MariaDBTestFrameworkExtension.java b/test-framework/db-mariadb/src/main/java/org/keycloak/testframework/database/MariaDBTestFrameworkExtension.java index a28c32ac562..7b6f9aebd81 100644 --- a/test-framework/db-mariadb/src/main/java/org/keycloak/testframework/database/MariaDBTestFrameworkExtension.java +++ b/test-framework/db-mariadb/src/main/java/org/keycloak/testframework/database/MariaDBTestFrameworkExtension.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.database; +import java.util.List; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; -import java.util.List; - public class MariaDBTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/db-mssql/src/main/java/org/keycloak/testframework/database/MSSQLServerTestDatabase.java b/test-framework/db-mssql/src/main/java/org/keycloak/testframework/database/MSSQLServerTestDatabase.java index 466432bcd4a..c0142dfc71c 100644 --- a/test-framework/db-mssql/src/main/java/org/keycloak/testframework/database/MSSQLServerTestDatabase.java +++ b/test-framework/db-mssql/src/main/java/org/keycloak/testframework/database/MSSQLServerTestDatabase.java @@ -1,13 +1,14 @@ package org.keycloak.testframework.database; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.testframework.util.ContainerImages; + +import org.jboss.logging.Logger; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.containers.MSSQLServerContainer; import org.testcontainers.utility.DockerImageName; -import java.util.List; - class MSSQLServerTestDatabase extends AbstractContainerTestDatabase { private static final Logger LOGGER = Logger.getLogger(MSSQLServerTestDatabase.class); diff --git a/test-framework/db-mssql/src/main/java/org/keycloak/testframework/database/MSSQLServerTestFrameworkExtension.java b/test-framework/db-mssql/src/main/java/org/keycloak/testframework/database/MSSQLServerTestFrameworkExtension.java index 7ab6fa7c769..01287723529 100644 --- a/test-framework/db-mssql/src/main/java/org/keycloak/testframework/database/MSSQLServerTestFrameworkExtension.java +++ b/test-framework/db-mssql/src/main/java/org/keycloak/testframework/database/MSSQLServerTestFrameworkExtension.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.database; +import java.util.List; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; -import java.util.List; - public class MSSQLServerTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/db-mysql/src/main/java/org/keycloak/testframework/database/MySQLTestDatabase.java b/test-framework/db-mysql/src/main/java/org/keycloak/testframework/database/MySQLTestDatabase.java index 69fe65de382..e0f9fb6ce52 100644 --- a/test-framework/db-mysql/src/main/java/org/keycloak/testframework/database/MySQLTestDatabase.java +++ b/test-framework/db-mysql/src/main/java/org/keycloak/testframework/database/MySQLTestDatabase.java @@ -1,7 +1,8 @@ package org.keycloak.testframework.database; -import org.jboss.logging.Logger; import org.keycloak.testframework.util.ContainerImages; + +import org.jboss.logging.Logger; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.containers.MySQLContainer; import org.testcontainers.utility.DockerImageName; diff --git a/test-framework/db-mysql/src/main/java/org/keycloak/testframework/database/MySQLTestFrameworkExtension.java b/test-framework/db-mysql/src/main/java/org/keycloak/testframework/database/MySQLTestFrameworkExtension.java index e75b5814ca9..7f205978760 100644 --- a/test-framework/db-mysql/src/main/java/org/keycloak/testframework/database/MySQLTestFrameworkExtension.java +++ b/test-framework/db-mysql/src/main/java/org/keycloak/testframework/database/MySQLTestFrameworkExtension.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.database; +import java.util.List; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; -import java.util.List; - public class MySQLTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/db-oracle/src/main/java/org/keycloak/testframework/database/OracleTestDatabase.java b/test-framework/db-oracle/src/main/java/org/keycloak/testframework/database/OracleTestDatabase.java index 2e379b4009d..42e77a7c73a 100644 --- a/test-framework/db-oracle/src/main/java/org/keycloak/testframework/database/OracleTestDatabase.java +++ b/test-framework/db-oracle/src/main/java/org/keycloak/testframework/database/OracleTestDatabase.java @@ -1,7 +1,8 @@ package org.keycloak.testframework.database; -import org.jboss.logging.Logger; import org.keycloak.testframework.util.ContainerImages; + +import org.jboss.logging.Logger; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.oracle.OracleContainer; import org.testcontainers.utility.DockerImageName; diff --git a/test-framework/db-oracle/src/main/java/org/keycloak/testframework/database/OracleTestFrameworkExtension.java b/test-framework/db-oracle/src/main/java/org/keycloak/testframework/database/OracleTestFrameworkExtension.java index d895122c557..2184b331ec5 100644 --- a/test-framework/db-oracle/src/main/java/org/keycloak/testframework/database/OracleTestFrameworkExtension.java +++ b/test-framework/db-oracle/src/main/java/org/keycloak/testframework/database/OracleTestFrameworkExtension.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.database; +import java.util.List; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; -import java.util.List; - public class OracleTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/db-postgres/src/main/java/org/keycloak/testframework/database/PostgresTestDatabase.java b/test-framework/db-postgres/src/main/java/org/keycloak/testframework/database/PostgresTestDatabase.java index bf7eeb259c0..615f4c9ad52 100644 --- a/test-framework/db-postgres/src/main/java/org/keycloak/testframework/database/PostgresTestDatabase.java +++ b/test-framework/db-postgres/src/main/java/org/keycloak/testframework/database/PostgresTestDatabase.java @@ -1,7 +1,8 @@ package org.keycloak.testframework.database; -import org.jboss.logging.Logger; import org.keycloak.testframework.util.ContainerImages; + +import org.jboss.logging.Logger; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.containers.PostgreSQLContainer; import org.testcontainers.utility.DockerImageName; diff --git a/test-framework/db-postgres/src/main/java/org/keycloak/testframework/database/PostgresTestFrameworkExtension.java b/test-framework/db-postgres/src/main/java/org/keycloak/testframework/database/PostgresTestFrameworkExtension.java index 9bb33bd58d6..7e0ecf79ff6 100644 --- a/test-framework/db-postgres/src/main/java/org/keycloak/testframework/database/PostgresTestFrameworkExtension.java +++ b/test-framework/db-postgres/src/main/java/org/keycloak/testframework/database/PostgresTestFrameworkExtension.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.database; +import java.util.List; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; -import java.util.List; - public class PostgresTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/db-tidb/src/main/java/org/keycloak/testframework/database/TiDBTestDatabase.java b/test-framework/db-tidb/src/main/java/org/keycloak/testframework/database/TiDBTestDatabase.java index 537a316e6ab..ef6efd8aaca 100644 --- a/test-framework/db-tidb/src/main/java/org/keycloak/testframework/database/TiDBTestDatabase.java +++ b/test-framework/db-tidb/src/main/java/org/keycloak/testframework/database/TiDBTestDatabase.java @@ -1,8 +1,9 @@ package org.keycloak.testframework.database; +import org.keycloak.testframework.util.ContainerImages; + import org.apache.commons.lang3.StringUtils; import org.jboss.logging.Logger; -import org.keycloak.testframework.util.ContainerImages; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.tidb.TiDBContainer; import org.testcontainers.utility.DockerImageName; diff --git a/test-framework/db-tidb/src/main/java/org/keycloak/testframework/database/TiDBTestFrameworkExtension.java b/test-framework/db-tidb/src/main/java/org/keycloak/testframework/database/TiDBTestFrameworkExtension.java index 84c8a128d2b..cd5e4a75fb7 100644 --- a/test-framework/db-tidb/src/main/java/org/keycloak/testframework/database/TiDBTestFrameworkExtension.java +++ b/test-framework/db-tidb/src/main/java/org/keycloak/testframework/database/TiDBTestFrameworkExtension.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.database; +import java.util.List; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; -import java.util.List; - public class TiDBTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/email-server/src/main/java/org/keycloak/testframework/mail/GreenMailTestFrameworkExtension.java b/test-framework/email-server/src/main/java/org/keycloak/testframework/mail/GreenMailTestFrameworkExtension.java index c6117468063..3e2953b3d3c 100644 --- a/test-framework/email-server/src/main/java/org/keycloak/testframework/mail/GreenMailTestFrameworkExtension.java +++ b/test-framework/email-server/src/main/java/org/keycloak/testframework/mail/GreenMailTestFrameworkExtension.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.mail; +import java.util.List; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; -import java.util.List; - public class GreenMailTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/email-server/src/main/java/org/keycloak/testframework/mail/MailServer.java b/test-framework/email-server/src/main/java/org/keycloak/testframework/mail/MailServer.java index 76dae5661af..3fd10a74141 100644 --- a/test-framework/email-server/src/main/java/org/keycloak/testframework/mail/MailServer.java +++ b/test-framework/email-server/src/main/java/org/keycloak/testframework/mail/MailServer.java @@ -1,12 +1,14 @@ package org.keycloak.testframework.mail; +import jakarta.mail.internet.MimeMessage; + +import org.keycloak.testframework.injection.ManagedTestResource; + import com.icegreen.greenmail.store.FolderException; import com.icegreen.greenmail.user.GreenMailUser; import com.icegreen.greenmail.user.TokenValidator; import com.icegreen.greenmail.util.GreenMail; import com.icegreen.greenmail.util.ServerSetup; -import jakarta.mail.internet.MimeMessage; -import org.keycloak.testframework.injection.ManagedTestResource; public class MailServer extends ManagedTestResource { diff --git a/test-framework/examples/providers/src/main/java/org/keycloak/providers/example/MyCustomRealmResourceProvider.java b/test-framework/examples/providers/src/main/java/org/keycloak/providers/example/MyCustomRealmResourceProvider.java index 572970303f0..6dd9431d31e 100644 --- a/test-framework/examples/providers/src/main/java/org/keycloak/providers/example/MyCustomRealmResourceProvider.java +++ b/test-framework/examples/providers/src/main/java/org/keycloak/providers/example/MyCustomRealmResourceProvider.java @@ -5,6 +5,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.models.KeycloakSession; import org.keycloak.services.resource.RealmResourceProvider; diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminClientFactoryTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminClientFactoryTest.java index c185d04f7f4..16c2b5e315d 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminClientFactoryTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminClientFactoryTest.java @@ -1,8 +1,5 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.testframework.admin.AdminClientBuilder; import org.keycloak.testframework.admin.AdminClientFactory; @@ -12,6 +9,10 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.realm.ManagedRealm; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class AdminClientFactoryTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminEventsTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminEventsTest.java index 3344cffb65d..a2a464a414c 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminEventsTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AdminEventsTest.java @@ -1,7 +1,8 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.admin.client.Keycloak; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -17,8 +18,8 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.util.ApiUtil; -import java.util.LinkedList; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest public class AdminEventsTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AttachToTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AttachToTest.java index bc6a77a6e16..29fbebe12f5 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AttachToTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/AttachToTest.java @@ -1,9 +1,5 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.admin.client.Keycloak; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.InjectClient; @@ -12,6 +8,11 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.ManagedRealm; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; + @KeycloakIntegrationTest @TestMethodOrder(MethodOrderer.MethodName.class) public class AttachToTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CleanupTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CleanupTest.java index f0452ab9cd7..6e54d054678 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CleanupTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CleanupTest.java @@ -1,12 +1,13 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedRealm; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class CleanupTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ClientRollbackTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ClientRollbackTest.java index b2bfb857586..40e41f4e745 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ClientRollbackTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ClientRollbackTest.java @@ -1,9 +1,5 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testframework.annotations.InjectClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; @@ -11,6 +7,11 @@ import org.keycloak.testframework.realm.ClientConfig; import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.ManagedClient; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; + @KeycloakIntegrationTest @TestMethodOrder(MethodOrderer.MethodName.class) diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CustomConfigBuilderTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CustomConfigBuilderTest.java index beb27690d3c..1cb3faa2ef5 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CustomConfigBuilderTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CustomConfigBuilderTest.java @@ -1,7 +1,7 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.LinkedList; + import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.testframework.annotations.InjectClient; import org.keycloak.testframework.annotations.InjectRealm; @@ -17,7 +17,8 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.realm.UserConfig; import org.keycloak.testframework.realm.UserConfigBuilder; -import java.util.LinkedList; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest public class CustomConfigBuilderTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CustomConfigTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CustomConfigTest.java index 0ba3e5e9a8d..424e01e204e 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CustomConfigTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/CustomConfigTest.java @@ -1,16 +1,17 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.Optional; + import org.keycloak.admin.client.Keycloak; import org.keycloak.common.Profile; import org.keycloak.representations.info.FeatureRepresentation; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.testframework.server.KeycloakServerConfig; +import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import java.util.Optional; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest(config = CustomConfigTest.CustomServerConfig.class) public class CustomConfigTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/DefaultConfig1Test.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/DefaultConfig1Test.java index 6dd55a4d72a..583c2fd50a9 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/DefaultConfig1Test.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/DefaultConfig1Test.java @@ -1,13 +1,14 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.List; + import org.keycloak.admin.client.Keycloak; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest public class DefaultConfig1Test { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/DefaultConfig2Test.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/DefaultConfig2Test.java index b3f3cf05d0e..5c922e5c8dc 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/DefaultConfig2Test.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/DefaultConfig2Test.java @@ -1,13 +1,14 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.List; + import org.keycloak.admin.client.Keycloak; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest public class DefaultConfig2Test { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/EmailTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/EmailTest.java index 96be4b93e3c..9f991a83a4c 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/EmailTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/EmailTest.java @@ -1,11 +1,10 @@ package org.keycloak.test.examples; +import java.util.Map; + import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.events.email.EmailEventListenerProviderFactory; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.InjectUser; @@ -21,7 +20,10 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.realm.UserConfig; import org.keycloak.testframework.realm.UserConfigBuilder; -import java.util.Map; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest public class EmailTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/EventsTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/EventsTest.java index 5947dca3dce..aae88538bbf 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/EventsTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/EventsTest.java @@ -1,7 +1,5 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.events.EventType; import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.testframework.annotations.InjectEvents; @@ -14,6 +12,9 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.remote.timeoffset.InjectTimeOffSet; import org.keycloak.testframework.remote.timeoffset.TimeOffSet; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class EventsTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/FancyRealmTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/FancyRealmTest.java index 9025d468cd7..4a98d77b2bb 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/FancyRealmTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/FancyRealmTest.java @@ -1,7 +1,5 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.testframework.annotations.InjectClient; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.InjectUser; @@ -17,6 +15,9 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.realm.UserConfig; import org.keycloak.testframework.realm.UserConfigBuilder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class FancyRealmTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/GlobalManagedResourcesTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/GlobalManagedResourcesTest.java index 42a133340ea..8ae68b3fe88 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/GlobalManagedResourcesTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/GlobalManagedResourcesTest.java @@ -1,7 +1,5 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.testframework.annotations.InjectClient; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.InjectUser; @@ -11,6 +9,9 @@ import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.ManagedUser; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class GlobalManagedResourcesTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/InjectIntoAbstractFieldsTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/InjectIntoAbstractFieldsTest.java index 19848c390d0..d0d8016c480 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/InjectIntoAbstractFieldsTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/InjectIntoAbstractFieldsTest.java @@ -1,8 +1,9 @@ package org.keycloak.test.examples; +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; + import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; @KeycloakIntegrationTest public class InjectIntoAbstractFieldsTest extends AbstractTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ManagedResources2Test.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ManagedResources2Test.java index 0b3d3133fcf..c5ad1f7c6ba 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ManagedResources2Test.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ManagedResources2Test.java @@ -1,7 +1,7 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.List; + import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testframework.annotations.InjectClient; import org.keycloak.testframework.annotations.InjectRealm; @@ -10,7 +10,8 @@ import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.ManagedRealm; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest public class ManagedResources2Test { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ManagedResourcesTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ManagedResourcesTest.java index a0fc76c2957..2416256bbb7 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ManagedResourcesTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/ManagedResourcesTest.java @@ -1,7 +1,5 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.testframework.annotations.InjectClient; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.InjectUser; @@ -11,6 +9,9 @@ import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.ManagedUser; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class ManagedResourcesTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/MultipleInstancesTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/MultipleInstancesTest.java index 13bb77fa1f0..585e2535f59 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/MultipleInstancesTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/MultipleInstancesTest.java @@ -1,7 +1,5 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.InjectRealm; @@ -12,6 +10,9 @@ import org.keycloak.testframework.realm.ManagedUser; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class MultipleInstancesTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/MyCustomProviderTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/MyCustomProviderTest.java index e36a8f58b53..81ab619e1ef 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/MyCustomProviderTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/MyCustomProviderTest.java @@ -1,5 +1,14 @@ package org.keycloak.test.examples; +import java.io.IOException; +import java.nio.charset.StandardCharsets; + +import org.keycloak.testframework.annotations.InjectRealm; +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.keycloak.testframework.realm.ManagedRealm; +import org.keycloak.testframework.server.KeycloakServerConfig; +import org.keycloak.testframework.server.KeycloakServerConfigBuilder; + import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; @@ -7,14 +16,6 @@ import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.HttpClientBuilder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.keycloak.testframework.annotations.InjectRealm; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import org.keycloak.testframework.realm.ManagedRealm; -import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import org.keycloak.testframework.server.KeycloakServerConfig; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; /** diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/OAuthClientTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/OAuthClientTest.java index e895b7720bb..82aa5c4c32d 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/OAuthClientTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/OAuthClientTest.java @@ -1,7 +1,7 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.io.IOException; + import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; import org.keycloak.representations.AccessToken; import org.keycloak.testframework.annotations.InjectRealm; @@ -21,7 +21,8 @@ import org.keycloak.testsuite.util.oauth.IntrospectionResponse; import org.keycloak.testsuite.util.oauth.TokenRevocationResponse; import org.keycloak.testsuite.util.oauth.UserInfoResponse; -import java.io.IOException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest public class OAuthClientTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/PagesTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/PagesTest.java index d3b398cbead..2fc80110be4 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/PagesTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/PagesTest.java @@ -1,7 +1,5 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; @@ -11,6 +9,9 @@ import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.LoginPage; import org.keycloak.testframework.ui.page.WelcomePage; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RealmSpecificAdminClientTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RealmSpecificAdminClientTest.java index ed3f47fa197..a3fc1ea9279 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RealmSpecificAdminClientTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RealmSpecificAdminClientTest.java @@ -1,7 +1,7 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.List; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.jose.jws.JWSInput; @@ -19,7 +19,8 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest public class RealmSpecificAdminClientTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RunOnServerTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RunOnServerTest.java index 69387266b26..6ee5128032c 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RunOnServerTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RunOnServerTest.java @@ -1,7 +1,5 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.models.ModelException; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.ModelToRepresentation; @@ -12,6 +10,9 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.remote.providers.runonserver.RunOnServerException; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.opentest4j.AssertionFailedError; @KeycloakIntegrationTest diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TestAppTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TestAppTest.java index 5852626042c..a283d4d5c5f 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TestAppTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TestAppTest.java @@ -1,7 +1,5 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.representations.adapters.action.PushNotBeforeAction; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; @@ -11,6 +9,9 @@ import org.keycloak.testframework.oauth.annotations.InjectOAuthClient; import org.keycloak.testframework.oauth.annotations.InjectTestApp; import org.keycloak.testframework.realm.ManagedRealm; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class TestAppTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TimeOffSetExampleTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TimeOffSetExampleTest.java index f568d0e19e8..ed6cadf3d50 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TimeOffSetExampleTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TimeOffSetExampleTest.java @@ -1,11 +1,12 @@ package org.keycloak.test.examples; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.remote.timeoffset.InjectTimeOffSet; import org.keycloak.testframework.remote.timeoffset.TimeOffSet; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class TimeOffSetExampleTest { diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TlsEnabledTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TlsEnabledTest.java index 0f1934062b4..b8cdc2c2f93 100644 --- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TlsEnabledTest.java +++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/TlsEnabledTest.java @@ -1,10 +1,13 @@ package org.keycloak.test.examples; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.net.URL; +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.cert.CertificateExpiredException; +import java.security.cert.CertificateNotYetValidException; +import java.security.cert.X509Certificate; + import org.keycloak.admin.client.Keycloak; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.InjectHttpClient; @@ -18,13 +21,11 @@ import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.testframework.server.KeycloakUrls; -import java.io.IOException; -import java.net.URL; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.cert.CertificateExpiredException; -import java.security.cert.CertificateNotYetValidException; -import java.security.cert.X509Certificate; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest(config = TlsEnabledTest.TlsEnabledServerConfig.class) public class TlsEnabledTest { diff --git a/test-framework/junit5-config/src/main/java/org/keycloak/testframework/ServerConfigClassOrderer.java b/test-framework/junit5-config/src/main/java/org/keycloak/testframework/ServerConfigClassOrderer.java index 890725439c7..056a1362619 100644 --- a/test-framework/junit5-config/src/main/java/org/keycloak/testframework/ServerConfigClassOrderer.java +++ b/test-framework/junit5-config/src/main/java/org/keycloak/testframework/ServerConfigClassOrderer.java @@ -1,12 +1,13 @@ package org.keycloak.testframework; +import java.util.Optional; + +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; + import org.infinispan.util.function.SerializableComparator; import org.junit.jupiter.api.ClassDescriptor; import org.junit.jupiter.api.ClassOrderer; import org.junit.jupiter.api.ClassOrdererContext; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; - -import java.util.Optional; public class ServerConfigClassOrderer implements ClassOrderer { diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/KcAdminCallbackHandler.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/KcAdminCallbackHandler.java index 889ea742138..5903275d2e4 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/KcAdminCallbackHandler.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/KcAdminCallbackHandler.java @@ -1,7 +1,8 @@ package org.keycloak.testframework.oauth; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; +import java.io.IOException; +import java.nio.charset.StandardCharsets; + import org.keycloak.constants.AdapterConstants; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; @@ -9,8 +10,8 @@ import org.keycloak.representations.adapters.action.LogoutAction; import org.keycloak.representations.adapters.action.PushNotBeforeAction; import org.keycloak.representations.adapters.action.TestAvailabilityAction; -import java.io.IOException; -import java.nio.charset.StandardCharsets; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; public class KcAdminCallbackHandler implements HttpHandler { diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/KcAdminInvocations.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/KcAdminInvocations.java index 62d169a5433..24fce39a53d 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/KcAdminInvocations.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/KcAdminInvocations.java @@ -1,13 +1,13 @@ package org.keycloak.testframework.oauth; -import org.keycloak.representations.adapters.action.LogoutAction; -import org.keycloak.representations.adapters.action.PushNotBeforeAction; -import org.keycloak.representations.adapters.action.TestAvailabilityAction; - import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; +import org.keycloak.representations.adapters.action.LogoutAction; +import org.keycloak.representations.adapters.action.PushNotBeforeAction; +import org.keycloak.representations.adapters.action.TestAvailabilityAction; + public class KcAdminInvocations { private final BlockingQueue adminLogoutActions = new LinkedBlockingQueue<>(); diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthCallbackHandler.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthCallbackHandler.java index ee67af46cc5..93569cb2ff6 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthCallbackHandler.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthCallbackHandler.java @@ -1,11 +1,11 @@ package org.keycloak.testframework.oauth; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; - import java.io.IOException; import java.nio.charset.StandardCharsets; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; + class OAuthCallbackHandler implements HttpHandler { @Override diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClient.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClient.java index e255d221cc0..234a1d06928 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClient.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClient.java @@ -1,11 +1,12 @@ package org.keycloak.testframework.oauth; -import org.apache.http.impl.client.CloseableHttpClient; import org.keycloak.OAuth2Constants; import org.keycloak.client.registration.ClientRegistration; import org.keycloak.testframework.ui.page.LoginPage; import org.keycloak.testsuite.util.oauth.AbstractOAuthClient; import org.keycloak.testsuite.util.oauth.OAuthClientConfig; + +import org.apache.http.impl.client.CloseableHttpClient; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.PageFactory; diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClientSupplier.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClientSupplier.java index 2c50127a1a0..afc04e09c60 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClientSupplier.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthClientSupplier.java @@ -1,7 +1,5 @@ package org.keycloak.testframework.oauth; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.CloseableHttpClient; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.RequestedInstance; @@ -13,6 +11,9 @@ import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testframework.util.ApiUtil; + +import org.apache.http.client.HttpClient; +import org.apache.http.impl.client.CloseableHttpClient; import org.openqa.selenium.WebDriver; public class OAuthClientSupplier implements Supplier { diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthIdentityProvider.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthIdentityProvider.java index fafb9474c16..d14b7f2b653 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthIdentityProvider.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthIdentityProvider.java @@ -1,8 +1,14 @@ package org.keycloak.testframework.oauth; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.spec.ECGenParameterSpec; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.ECDSASignatureSignerContext; @@ -15,14 +21,9 @@ import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.representations.JsonWebToken; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.charset.StandardCharsets; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.spec.ECGenParameterSpec; -import java.util.HashMap; -import java.util.Map; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; public class OAuthIdentityProvider { diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthIdentityProviderSupplier.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthIdentityProviderSupplier.java index 2a783c91a2a..fe273885b38 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthIdentityProviderSupplier.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthIdentityProviderSupplier.java @@ -1,12 +1,13 @@ package org.keycloak.testframework.oauth; -import com.sun.net.httpserver.HttpServer; import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.RequestedInstance; import org.keycloak.testframework.injection.Supplier; import org.keycloak.testframework.injection.SupplierHelpers; import org.keycloak.testframework.oauth.annotations.InjectOAuthIdentityProvider; +import com.sun.net.httpserver.HttpServer; + public class OAuthIdentityProviderSupplier implements Supplier { @Override diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthTestFrameworkExtension.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthTestFrameworkExtension.java index 05db80387e8..c67d3a90e67 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthTestFrameworkExtension.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/OAuthTestFrameworkExtension.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.oauth; +import java.util.List; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; -import java.util.List; - public class OAuthTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/TestAppSupplier.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/TestAppSupplier.java index 77d095f3454..36f52131d27 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/TestAppSupplier.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/TestAppSupplier.java @@ -1,11 +1,12 @@ package org.keycloak.testframework.oauth; -import com.sun.net.httpserver.HttpServer; import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.RequestedInstance; import org.keycloak.testframework.injection.Supplier; import org.keycloak.testframework.oauth.annotations.InjectTestApp; +import com.sun.net.httpserver.HttpServer; + public class TestAppSupplier implements Supplier { @Override diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/annotations/InjectOAuthClient.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/annotations/InjectOAuthClient.java index e830802a670..2c3b417b8a3 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/annotations/InjectOAuthClient.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/annotations/InjectOAuthClient.java @@ -1,14 +1,14 @@ package org.keycloak.testframework.oauth.annotations; -import org.keycloak.testframework.injection.LifeCycle; -import org.keycloak.testframework.oauth.DefaultOAuthClientConfiguration; -import org.keycloak.testframework.realm.ClientConfig; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.injection.LifeCycle; +import org.keycloak.testframework.oauth.DefaultOAuthClientConfiguration; +import org.keycloak.testframework.realm.ClientConfig; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface InjectOAuthClient { diff --git a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/annotations/InjectOAuthIdentityProvider.java b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/annotations/InjectOAuthIdentityProvider.java index 59c972ab152..cdf4c1b013b 100644 --- a/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/annotations/InjectOAuthIdentityProvider.java +++ b/test-framework/oauth/src/main/java/org/keycloak/testframework/oauth/annotations/InjectOAuthIdentityProvider.java @@ -1,14 +1,14 @@ package org.keycloak.testframework.oauth.annotations; -import org.keycloak.testframework.injection.LifeCycle; -import org.keycloak.testframework.oauth.DefaultOAuthIdentityProviderConfig; -import org.keycloak.testframework.oauth.OAuthIdentityProviderConfig; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.injection.LifeCycle; +import org.keycloak.testframework.oauth.DefaultOAuthIdentityProviderConfig; +import org.keycloak.testframework.oauth.OAuthIdentityProviderConfig; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface InjectOAuthIdentityProvider { diff --git a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/FetchOnServer.java b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/FetchOnServer.java index e72db9f0879..cf2d2ed02b0 100644 --- a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/FetchOnServer.java +++ b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/FetchOnServer.java @@ -17,10 +17,10 @@ package org.keycloak.testframework.remote.providers.runonserver; -import org.keycloak.models.KeycloakSession; - import java.io.Serializable; +import org.keycloak.models.KeycloakSession; + /** * @author Stian Thorgersen */ diff --git a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServer.java b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServer.java index a0a75ff2ca4..3a737d0ba50 100644 --- a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServer.java +++ b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServer.java @@ -1,11 +1,11 @@ package org.keycloak.testframework.remote.providers.runonserver; -import org.keycloak.common.VerificationException; -import org.keycloak.models.KeycloakSession; - import java.io.IOException; import java.io.Serializable; +import org.keycloak.common.VerificationException; +import org.keycloak.models.KeycloakSession; + /** * @author Stian Thorgersen */ diff --git a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServerRealmResourceProvider.java b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServerRealmResourceProvider.java index 4ea46f3da35..764d9952dc3 100644 --- a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServerRealmResourceProvider.java +++ b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServerRealmResourceProvider.java @@ -5,6 +5,7 @@ import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; + import org.keycloak.models.KeycloakSession; import org.keycloak.services.resource.RealmResourceProvider; import org.keycloak.util.JsonSerialization; diff --git a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServerRealmResourceProviderFactory.java b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServerRealmResourceProviderFactory.java index 92d109edb03..d1121360318 100644 --- a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServerRealmResourceProviderFactory.java +++ b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/runonserver/RunOnServerRealmResourceProviderFactory.java @@ -1,12 +1,12 @@ package org.keycloak.testframework.remote.providers.runonserver; +import java.net.MalformedURLException; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.services.resource.RealmResourceProvider; import org.keycloak.services.resource.RealmResourceProviderFactory; -import java.net.MalformedURLException; - public class RunOnServerRealmResourceProviderFactory implements RealmResourceProviderFactory { private static final String ID = "testing-run-on-server"; diff --git a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/timeoffset/TimeOffSetRealmResourceProvider.java b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/timeoffset/TimeOffSetRealmResourceProvider.java index efb5f23c4c9..84570c22a91 100644 --- a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/timeoffset/TimeOffSetRealmResourceProvider.java +++ b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/timeoffset/TimeOffSetRealmResourceProvider.java @@ -1,5 +1,7 @@ package org.keycloak.testframework.remote.providers.timeoffset; +import java.util.Map; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.PUT; @@ -7,12 +9,11 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; + import org.keycloak.common.util.Time; import org.keycloak.models.KeycloakSession; import org.keycloak.services.resource.RealmResourceProvider; -import java.util.Map; - public class TimeOffSetRealmResourceProvider implements RealmResourceProvider { private final KeycloakSession session; diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/InjectRemoteProviders.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/InjectRemoteProviders.java index fb8ab22305d..4f48bf98995 100644 --- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/InjectRemoteProviders.java +++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/InjectRemoteProviders.java @@ -1,10 +1,10 @@ package org.keycloak.testframework.remote; -import org.keycloak.testframework.injection.LifeCycle; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import org.keycloak.testframework.injection.LifeCycle; + @Retention(RetentionPolicy.RUNTIME) public @interface InjectRemoteProviders { diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/RemoteTestFrameworkExtension.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/RemoteTestFrameworkExtension.java index ab9ecdbbb6a..63d44046fe7 100644 --- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/RemoteTestFrameworkExtension.java +++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/RemoteTestFrameworkExtension.java @@ -1,12 +1,12 @@ package org.keycloak.testframework.remote; +import java.util.List; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; -import org.keycloak.testframework.remote.timeoffset.TimeOffsetSupplier; import org.keycloak.testframework.remote.runonserver.RunOnServerSupplier; import org.keycloak.testframework.remote.runonserver.TestClassServerSupplier; - -import java.util.List; +import org.keycloak.testframework.remote.timeoffset.TimeOffsetSupplier; public class RemoteTestFrameworkExtension implements TestFrameworkExtension { @Override diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectRunOnServer.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectRunOnServer.java index 0cecc1605f3..72ba8a320a3 100644 --- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectRunOnServer.java +++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectRunOnServer.java @@ -1,12 +1,12 @@ package org.keycloak.testframework.remote.runonserver; -import org.keycloak.testframework.injection.LifeCycle; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.injection.LifeCycle; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface InjectRunOnServer { diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectTestClassServer.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectTestClassServer.java index 2f496f8a84d..aebfedd1312 100644 --- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectTestClassServer.java +++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectTestClassServer.java @@ -1,12 +1,12 @@ package org.keycloak.testframework.remote.runonserver; -import org.keycloak.testframework.injection.LifeCycle; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.injection.LifeCycle; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface InjectTestClassServer { diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerClient.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerClient.java index 931c44898ad..2ee685c6f8a 100644 --- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerClient.java +++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerClient.java @@ -1,12 +1,10 @@ package org.keycloak.testframework.remote.runonserver; +import java.io.IOException; + import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.util.EntityUtils; + import org.keycloak.testframework.remote.providers.runonserver.FetchOnServer; import org.keycloak.testframework.remote.providers.runonserver.FetchOnServerWrapper; import org.keycloak.testframework.remote.providers.runonserver.RunOnServer; @@ -14,7 +12,11 @@ import org.keycloak.testframework.remote.providers.runonserver.RunOnServerExcept import org.keycloak.testframework.remote.providers.runonserver.SerializationUtil; import org.keycloak.util.JsonSerialization; -import java.io.IOException; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.util.EntityUtils; public class RunOnServerClient { @@ -90,4 +92,3 @@ public class RunOnServerClient { } } } - diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerSupplier.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerSupplier.java index e927a6cff1f..cc37de1de94 100644 --- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerSupplier.java +++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerSupplier.java @@ -1,6 +1,8 @@ package org.keycloak.testframework.remote.runonserver; -import org.apache.http.client.HttpClient; +import java.util.Arrays; +import java.util.HashSet; + import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.injection.RequestedInstance; @@ -9,8 +11,7 @@ import org.keycloak.testframework.injection.SupplierOrder; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.remote.RemoteProviders; -import java.util.Arrays; -import java.util.HashSet; +import org.apache.http.client.HttpClient; public class RunOnServerSupplier implements Supplier { diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServer.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServer.java index 3f38c54b4ab..00c3d4f0b52 100644 --- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServer.java +++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServer.java @@ -1,15 +1,15 @@ package org.keycloak.testframework.remote.runonserver; -import com.sun.net.httpserver.Headers; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; - import java.io.IOException; import java.io.InputStream; import java.util.HashSet; import java.util.Set; +import com.sun.net.httpserver.Headers; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; + public class TestClassServer { public static final String CONTEXT_PATH = "/test-classes/"; diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServerSupplier.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServerSupplier.java index 46ba8a84473..87c48bdbc3f 100644 --- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServerSupplier.java +++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServerSupplier.java @@ -1,10 +1,11 @@ package org.keycloak.testframework.remote.runonserver; -import com.sun.net.httpserver.HttpServer; import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.RequestedInstance; import org.keycloak.testframework.injection.Supplier; +import com.sun.net.httpserver.HttpServer; + public class TestClassServerSupplier implements Supplier { @Override diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/InjectTimeOffSet.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/InjectTimeOffSet.java index 62345de05f9..b64a9e1ddaa 100644 --- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/InjectTimeOffSet.java +++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/InjectTimeOffSet.java @@ -1,12 +1,12 @@ package org.keycloak.testframework.remote.timeoffset; -import org.keycloak.testframework.injection.LifeCycle; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.testframework.injection.LifeCycle; + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface InjectTimeOffSet { diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/TimeOffSet.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/TimeOffSet.java index e5b8a98d049..d75a9ff5ed5 100644 --- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/TimeOffSet.java +++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/TimeOffSet.java @@ -1,16 +1,18 @@ package org.keycloak.testframework.remote.timeoffset; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.util.Map; + import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; + +import org.keycloak.common.util.Time; + +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpPut; import org.apache.http.entity.StringEntity; -import org.keycloak.common.util.Time; - -import java.io.IOException; -import java.util.Map; public class TimeOffSet { private int currentOffset; diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/TimeOffsetSupplier.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/TimeOffsetSupplier.java index 47e10af7f59..dd6faec7669 100644 --- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/TimeOffsetSupplier.java +++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/timeoffset/TimeOffsetSupplier.java @@ -1,6 +1,5 @@ package org.keycloak.testframework.remote.timeoffset; -import org.apache.http.client.HttpClient; import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.injection.RequestedInstance; @@ -9,6 +8,8 @@ import org.keycloak.testframework.injection.SupplierOrder; import org.keycloak.testframework.remote.RemoteProviders; import org.keycloak.testframework.server.KeycloakUrls; +import org.apache.http.client.HttpClient; + public class TimeOffsetSupplier implements Supplier { @Override diff --git a/test-framework/remote/src/test/java/org/keycloak/testframework/remote/runonserver/TestClassServerTest.java b/test-framework/remote/src/test/java/org/keycloak/testframework/remote/runonserver/TestClassServerTest.java index c4b8d5ca2c5..0d2133023b1 100644 --- a/test-framework/remote/src/test/java/org/keycloak/testframework/remote/runonserver/TestClassServerTest.java +++ b/test-framework/remote/src/test/java/org/keycloak/testframework/remote/runonserver/TestClassServerTest.java @@ -1,12 +1,5 @@ package org.keycloak.testframework.remote.runonserver; -import com.sun.net.httpserver.HttpServer; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.keycloak.representations.idm.RealmRepresentation; - import java.io.IOException; import java.net.InetSocketAddress; import java.net.MalformedURLException; @@ -14,6 +7,14 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.Set; +import org.keycloak.representations.idm.RealmRepresentation; + +import com.sun.net.httpserver.HttpServer; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + public class TestClassServerTest { private static HttpServer SERVER; diff --git a/test-framework/ui/src/main/java/org/keycloak/testframework/ui/UITestFrameworkExtension.java b/test-framework/ui/src/main/java/org/keycloak/testframework/ui/UITestFrameworkExtension.java index af25ee3d89a..2627cfd20a8 100644 --- a/test-framework/ui/src/main/java/org/keycloak/testframework/ui/UITestFrameworkExtension.java +++ b/test-framework/ui/src/main/java/org/keycloak/testframework/ui/UITestFrameworkExtension.java @@ -1,5 +1,8 @@ package org.keycloak.testframework.ui; +import java.util.List; +import java.util.Map; + import org.keycloak.testframework.TestFrameworkExtension; import org.keycloak.testframework.injection.Supplier; import org.keycloak.testframework.ui.page.PageSupplier; @@ -8,10 +11,8 @@ import org.keycloak.testframework.ui.webdriver.ChromeWebDriverSupplier; import org.keycloak.testframework.ui.webdriver.FirefoxHeadlessWebDriverSupplier; import org.keycloak.testframework.ui.webdriver.FirefoxWebDriverSupplier; import org.keycloak.testframework.ui.webdriver.HtmlUnitWebDriverSupplier; -import org.openqa.selenium.WebDriver; -import java.util.List; -import java.util.Map; +import org.openqa.selenium.WebDriver; public class UITestFrameworkExtension implements TestFrameworkExtension { diff --git a/test-framework/ui/src/main/java/org/keycloak/testframework/ui/page/AbstractPage.java b/test-framework/ui/src/main/java/org/keycloak/testframework/ui/page/AbstractPage.java index 3ec4ebaf411..f7cceb14dc9 100644 --- a/test-framework/ui/src/main/java/org/keycloak/testframework/ui/page/AbstractPage.java +++ b/test-framework/ui/src/main/java/org/keycloak/testframework/ui/page/AbstractPage.java @@ -1,5 +1,7 @@ package org.keycloak.testframework.ui.page; +import java.time.Duration; + import org.junit.jupiter.api.Assertions; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -7,8 +9,6 @@ import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.PageFactory; import org.openqa.selenium.support.ui.WebDriverWait; -import java.time.Duration; - public abstract class AbstractPage { @FindBy(xpath = "//body") diff --git a/test-framework/ui/src/main/java/org/keycloak/testframework/ui/page/PageSupplier.java b/test-framework/ui/src/main/java/org/keycloak/testframework/ui/page/PageSupplier.java index 0b4f6bd9214..5eb3d004a54 100644 --- a/test-framework/ui/src/main/java/org/keycloak/testframework/ui/page/PageSupplier.java +++ b/test-framework/ui/src/main/java/org/keycloak/testframework/ui/page/PageSupplier.java @@ -1,12 +1,13 @@ package org.keycloak.testframework.ui.page; -import org.keycloak.testframework.ui.annotations.InjectPage; +import java.lang.reflect.Constructor; + import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.RequestedInstance; import org.keycloak.testframework.injection.Supplier; -import org.openqa.selenium.WebDriver; +import org.keycloak.testframework.ui.annotations.InjectPage; -import java.lang.reflect.Constructor; +import org.openqa.selenium.WebDriver; public class PageSupplier implements Supplier { diff --git a/test-framework/ui/src/main/java/org/keycloak/testframework/ui/webdriver/AbstractWebDriverSupplier.java b/test-framework/ui/src/main/java/org/keycloak/testframework/ui/webdriver/AbstractWebDriverSupplier.java index f3cb88732b5..7d19bf5e0c6 100644 --- a/test-framework/ui/src/main/java/org/keycloak/testframework/ui/webdriver/AbstractWebDriverSupplier.java +++ b/test-framework/ui/src/main/java/org/keycloak/testframework/ui/webdriver/AbstractWebDriverSupplier.java @@ -1,18 +1,19 @@ package org.keycloak.testframework.ui.webdriver; +import java.time.Duration; +import java.util.Map; + import org.keycloak.testframework.injection.InstanceContext; import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.injection.RequestedInstance; import org.keycloak.testframework.injection.Supplier; import org.keycloak.testframework.ui.annotations.InjectWebDriver; + import org.openqa.selenium.MutableCapabilities; import org.openqa.selenium.PageLoadStrategy; import org.openqa.selenium.WebDriver; import org.openqa.selenium.remote.CapabilityType; -import java.time.Duration; -import java.util.Map; - public abstract class AbstractWebDriverSupplier implements Supplier { @Override diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/AbstractPermissionsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/AbstractPermissionsTest.java index 3e4595aba48..d4ee25448e1 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/AbstractPermissionsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/AbstractPermissionsTest.java @@ -1,8 +1,13 @@ package org.keycloak.tests.admin; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; + import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.BeforeEach; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.Profile; @@ -24,10 +29,7 @@ import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.MailServerConfiguration; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; +import org.junit.jupiter.api.BeforeEach; import static org.junit.jupiter.api.Assertions.fail; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/AdminConsoleLandingPageTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/AdminConsoleLandingPageTest.java index 021e033f5a3..bcdc8566195 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/AdminConsoleLandingPageTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/AdminConsoleLandingPageTest.java @@ -1,21 +1,22 @@ package org.keycloak.tests.admin; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.util.EntityUtils; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.keycloak.testframework.annotations.InjectHttpClient; -import org.keycloak.testframework.annotations.InjectKeycloakUrls; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import org.keycloak.testframework.server.KeycloakUrls; - import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.keycloak.testframework.annotations.InjectHttpClient; +import org.keycloak.testframework.annotations.InjectKeycloakUrls; +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.keycloak.testframework.server.KeycloakUrls; + +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.util.EntityUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class AdminConsoleLandingPageTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/AdminConsoleWhoAmILocaleTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/AdminConsoleWhoAmILocaleTest.java index 45572981c2d..6896d98bfab 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/AdminConsoleWhoAmILocaleTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/AdminConsoleWhoAmILocaleTest.java @@ -1,15 +1,10 @@ package org.keycloak.tests.admin; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.util.List; + import jakarta.ws.rs.core.Response; -import org.apache.http.Header; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.message.BasicHeader; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.models.AdminRoles; import org.keycloak.models.Constants; import org.keycloak.representations.idm.RoleRepresentation; @@ -33,8 +28,15 @@ import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.io.IOException; -import java.util.List; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.http.Header; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.message.BasicHeader; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.keycloak.models.Constants.ADMIN_CLI_CLIENT_ID; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/AdminEndpointAccessibilityTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/AdminEndpointAccessibilityTest.java index eca077a9e6c..3efcc7e12d9 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/AdminEndpointAccessibilityTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/AdminEndpointAccessibilityTest.java @@ -1,9 +1,11 @@ package org.keycloak.tests.admin; +import java.util.List; +import java.util.UUID; + import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.RoleMappingResource; @@ -20,8 +22,8 @@ import org.keycloak.testframework.realm.GroupConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.List; -import java.util.UUID; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/AdminHeadersTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/AdminHeadersTest.java index b2863b7488c..6c48decef34 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/AdminHeadersTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/AdminHeadersTest.java @@ -2,13 +2,15 @@ package org.keycloak.tests.admin; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Test; + import org.keycloak.models.BrowserSecurityHeaders; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedRealm; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/AdminPreflightTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/AdminPreflightTest.java index 75028bc1e5b..6043db4ce08 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/AdminPreflightTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/AdminPreflightTest.java @@ -1,16 +1,17 @@ package org.keycloak.tests.admin; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpOptions; -import org.junit.jupiter.api.Test; +import java.io.IOException; + import org.keycloak.services.cors.Cors; import org.keycloak.testframework.annotations.InjectHttpClient; import org.keycloak.testframework.annotations.InjectKeycloakUrls; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.server.KeycloakUrls; -import java.io.IOException; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpOptions; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/AdminRootEdgeTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/AdminRootEdgeTest.java index 5e98103e4b5..67c51aa17d6 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/AdminRootEdgeTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/AdminRootEdgeTest.java @@ -17,21 +17,22 @@ package org.keycloak.tests.admin; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.startsWith; -import static org.junit.jupiter.api.Assertions.assertEquals; - import java.util.Map; +import org.keycloak.testframework.annotations.InjectHttpClient; +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.keycloak.testframework.server.KeycloakServerConfig; +import org.keycloak.testframework.server.KeycloakServerConfigBuilder; + import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.keycloak.testframework.annotations.InjectHttpClient; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import org.keycloak.testframework.server.KeycloakServerConfig; -import org.keycloak.testframework.server.KeycloakServerConfigBuilder; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.startsWith; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Vaclav Muzikar diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/AdminRootTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/AdminRootTest.java index 7dd1b66163d..83ab314cc11 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/AdminRootTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/AdminRootTest.java @@ -17,6 +17,14 @@ package org.keycloak.tests.admin; +import java.util.Arrays; +import java.util.Map; + +import org.keycloak.testframework.annotations.InjectHttpClient; +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.keycloak.testframework.server.KeycloakServerConfig; +import org.keycloak.testframework.server.KeycloakServerConfigBuilder; + import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; @@ -24,13 +32,6 @@ import org.apache.http.util.EntityUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -import org.keycloak.testframework.annotations.InjectHttpClient; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import org.keycloak.testframework.server.KeycloakServerConfig; -import org.keycloak.testframework.server.KeycloakServerConfigBuilder; - -import java.util.Arrays; -import java.util.Map; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/AdminSignatureAlgorithmTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/AdminSignatureAlgorithmTest.java index b728246c39a..8cb02462a2b 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/AdminSignatureAlgorithmTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/AdminSignatureAlgorithmTest.java @@ -1,6 +1,5 @@ package org.keycloak.tests.admin; -import org.junit.jupiter.api.Test; import org.keycloak.TokenVerifier; import org.keycloak.admin.client.Keycloak; import org.keycloak.crypto.Algorithm; @@ -11,6 +10,8 @@ import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedRealm; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; @KeycloakIntegrationTest diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/AttackDetectionResourceTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/AttackDetectionResourceTest.java index 8bcabfa3e2f..1142813d242 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/AttackDetectionResourceTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/AttackDetectionResourceTest.java @@ -17,7 +17,8 @@ package org.keycloak.tests.admin; -import org.junit.jupiter.api.Test; +import java.util.Map; + import org.keycloak.admin.client.resource.AttackDetectionResource; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -35,7 +36,7 @@ import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.tests.utils.admin.AdminEventPaths; -import java.util.Map; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/AuthzCleanupTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/AuthzCleanupTest.java index a416327313f..61dc1ff699f 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/AuthzCleanupTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/AuthzCleanupTest.java @@ -16,7 +16,6 @@ */ package org.keycloak.tests.admin; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; @@ -41,6 +40,8 @@ import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.util.JsonSerialization; +import org.junit.jupiter.api.Test; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ClientTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ClientTest.java index 662d2e724e3..58da9f823be 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ClientTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ClientTest.java @@ -17,13 +17,23 @@ package org.keycloak.tests.admin; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ProtocolMappersResource; @@ -60,28 +70,23 @@ import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; +import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; -import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static java.util.Arrays.asList; + +import static org.keycloak.models.Constants.defaultClients; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -97,7 +102,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import static org.keycloak.models.Constants.defaultClients; /** * @author Stian Thorgersen diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ComponentsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ComponentsTest.java index 364e70e7d0f..a68a4e5560d 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ComponentsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ComponentsTest.java @@ -17,14 +17,18 @@ package org.keycloak.tests.admin; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.function.BiConsumer; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.Response; -import org.apache.commons.lang3.RandomStringUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.hamcrest.Matchers; -import org.jboss.logging.Logger; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.ComponentResource; import org.keycloak.admin.client.resource.ComponentsResource; import org.keycloak.admin.client.resource.RealmResource; @@ -48,19 +52,17 @@ import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; +import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.components.TestComponentProvider; import org.keycloak.testsuite.components.TestComponentProviderFactory; -import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; -import java.util.stream.Collectors; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.concurrent.BasicThreadFactory; +import org.hamcrest.Matchers; +import org.jboss.logging.Logger; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java index 42579078e7b..aeecadadfa8 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ConsentsTest.java @@ -17,10 +17,9 @@ package org.keycloak.tests.admin; -import org.hamcrest.MatcherAssert; -import org.jboss.logging.Logger; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.List; +import java.util.Map; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -60,20 +59,22 @@ import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.ConsentPage; import org.keycloak.testframework.ui.page.LoginPage; +import org.keycloak.testsuite.util.AccountHelper; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.List; -import java.util.Map; +import org.hamcrest.MatcherAssert; +import org.jboss.logging.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; + +import static org.keycloak.tests.utils.admin.ApiUtil.findClientByClientId; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.tests.utils.admin.ApiUtil.findClientByClientId; - -import org.keycloak.testsuite.util.AccountHelper; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; /** * @author Marko Strukelj diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/CrossRealmPermissionsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/CrossRealmPermissionsTest.java index f90ee6fedeb..da3bc35d80d 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/CrossRealmPermissionsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/CrossRealmPermissionsTest.java @@ -17,10 +17,11 @@ package org.keycloak.tests.admin; +import java.util.concurrent.atomic.AtomicReference; + import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.util.Time; import org.keycloak.models.AdminRoles; @@ -34,7 +35,8 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.concurrent.atomic.AtomicReference; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Stian Thorgersen diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/DeclarativeUserTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/DeclarativeUserTest.java index 26dc3344790..03e5e3c6692 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/DeclarativeUserTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/DeclarativeUserTest.java @@ -1,10 +1,14 @@ package org.keycloak.tests.admin; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.models.UserModel; @@ -22,19 +26,18 @@ import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.userprofile.DeclarativeUserProfileProvider; import org.keycloak.userprofile.UserProfileProvider; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ALL; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.setUserProfileConfiguration; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ALL; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.setUserProfileConfiguration; /** * @author Pedro Igor diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/IllegalAdminUpgradeTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/IllegalAdminUpgradeTest.java index 367e575a378..1d976411724 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/IllegalAdminUpgradeTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/IllegalAdminUpgradeTest.java @@ -16,8 +16,12 @@ */ package org.keycloak.tests.admin; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.LinkedList; +import java.util.List; + +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.Keycloak; import org.keycloak.common.Profile; import org.keycloak.models.AdminRoles; @@ -38,18 +42,15 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; - -import jakarta.ws.rs.ClientErrorException; -import jakarta.ws.rs.core.Response; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import java.util.LinkedList; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; /** * @author Bill Burke diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationDisabledTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationDisabledTest.java index 4e009df4baf..d5bd57bb493 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationDisabledTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationDisabledTest.java @@ -19,16 +19,18 @@ package org.keycloak.tests.admin; import jakarta.ws.rs.ServerErrorException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.common.Profile; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.InjectUser; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.ManagedUser; -import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.testframework.server.KeycloakServerConfig; +import org.keycloak.testframework.server.KeycloakServerConfigBuilder; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Vlastislav Ramik diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationTest.java index a9160cd6b74..0d95bcfe3d6 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ImpersonationTest.java @@ -17,19 +17,19 @@ package org.keycloak.tests.admin; +import java.io.IOException; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.methods.RequestBuilder; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.util.EntityUtils; -import org.hamcrest.MatcherAssert; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.Config; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.Keycloak; @@ -79,18 +79,20 @@ import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.LoginPage; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.CredentialBuilder; + +import org.apache.http.HttpResponse; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.client.methods.RequestBuilder; +import org.apache.http.impl.client.BasicCookieStore; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; +import org.hamcrest.MatcherAssert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.openqa.selenium.Cookie; import org.openqa.selenium.WebDriver; -import java.io.IOException; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; - import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.is; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/InitialAccessTokenResourceTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/InitialAccessTokenResourceTest.java index fe528a15d05..a62f4aef25f 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/InitialAccessTokenResourceTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/InitialAccessTokenResourceTest.java @@ -17,10 +17,11 @@ package org.keycloak.tests.admin; +import java.util.List; +import java.util.stream.Collectors; + import jakarta.ws.rs.BadRequestException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.ClientInitialAccessResource; import org.keycloak.common.util.Time; import org.keycloak.events.admin.OperationType; @@ -42,8 +43,9 @@ import org.keycloak.testframework.remote.timeoffset.TimeOffSet; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.admin.AdminEventPaths; -import java.util.List; -import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ManagementPermissionsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ManagementPermissionsTest.java index a72ecbc89d6..3cd6a427f9d 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ManagementPermissionsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ManagementPermissionsTest.java @@ -17,7 +17,7 @@ package org.keycloak.tests.admin; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.GroupResource; import org.keycloak.admin.client.resource.RealmResource; @@ -35,6 +35,8 @@ import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.tests.utils.admin.ApiUtil; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTest.java index d2408c3bb66..b6a9aaf9d59 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTest.java @@ -17,12 +17,14 @@ package org.keycloak.tests.admin; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; + import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.core.Response; -import org.hamcrest.Matchers; -import org.jgroups.util.UUID; -import org.junit.Assert; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.RealmResource; @@ -51,17 +53,17 @@ import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.ManagedRealm; +import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.CredentialBuilder; import org.keycloak.testsuite.util.FederatedIdentityBuilder; import org.keycloak.testsuite.util.IdentityProviderBuilder; -import org.keycloak.testframework.realm.RoleConfigBuilder; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; +import org.hamcrest.Matchers; +import org.jgroups.util.UUID; +import org.junit.Assert; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTestV1.java b/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTestV1.java index 7c4934d56b8..cba48626a98 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTestV1.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsTestV1.java @@ -17,7 +17,8 @@ package org.keycloak.tests.admin; -import org.junit.jupiter.api.Test; +import java.util.Collections; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.authorization.PolicyRepresentation; @@ -32,7 +33,7 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.tests.admin.authz.fgap.KeycloakAdminPermissionsV1ServerConfig; import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.Collections; +import org.junit.jupiter.api.Test; import static org.keycloak.services.resources.admin.AdminAuth.Resource.AUTHORIZATION; import static org.keycloak.services.resources.admin.AdminAuth.Resource.CLIENT; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsWithRemovalTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsWithRemovalTest.java index c3eeb7164c4..083d5904b7c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsWithRemovalTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/PermissionsWithRemovalTest.java @@ -1,8 +1,10 @@ package org.keycloak.tests.admin; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.AdminRoles; import org.keycloak.representations.idm.AuthenticationExecutionInfoRepresentation; @@ -21,10 +23,9 @@ import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.tests.utils.Assert; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/RealmLocalizationResourceTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/RealmLocalizationResourceTest.java index bd6aa7c27d4..61082d38906 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/RealmLocalizationResourceTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/RealmLocalizationResourceTest.java @@ -17,9 +17,12 @@ package org.keycloak.tests.admin; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.NotFoundException; -import org.hamcrest.CoreMatchers; -import org.junit.jupiter.api.Test; + import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; @@ -27,9 +30,8 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/RoleByIdResourceTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/RoleByIdResourceTest.java index b12108721f1..371d20d8bab 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/RoleByIdResourceTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/RoleByIdResourceTest.java @@ -17,11 +17,19 @@ package org.keycloak.tests.admin; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.RoleByIdResource; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -36,19 +44,13 @@ import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.ManagedRealm; +import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.admin.AdminEventPaths; -import org.keycloak.testframework.realm.RoleConfigBuilder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/SMTPConnectionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/SMTPConnectionTest.java index 3128b3c60f5..e511372b128 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/SMTPConnectionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/SMTPConnectionTest.java @@ -17,11 +17,16 @@ package org.keycloak.tests.admin; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jakarta.mail.Address; +import jakarta.mail.internet.MimeMessage; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; @@ -31,10 +36,6 @@ import org.keycloak.models.Constants; import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; - -import jakarta.mail.Address; -import jakarta.mail.internet.MimeMessage; -import jakarta.ws.rs.core.Response; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.InjectKeycloakUrls; import org.keycloak.testframework.annotations.InjectRealm; @@ -48,17 +49,18 @@ import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.server.KeycloakUrls; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.fail; import static org.keycloak.representations.idm.ComponentRepresentation.SECRET_VALUE; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + /** * @author Bruno Oliveira */ diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/SMTPConnectionVaultTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/SMTPConnectionVaultTest.java index 0d13b4773d8..3d6f8798b2c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/SMTPConnectionVaultTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/SMTPConnectionVaultTest.java @@ -17,8 +17,12 @@ package org.keycloak.tests.admin; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.InjectRealm; @@ -29,9 +33,7 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/ServerInfoTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/ServerInfoTest.java index 082687229db..f716a8643bb 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/ServerInfoTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/ServerInfoTest.java @@ -17,8 +17,8 @@ package org.keycloak.tests.admin; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.Map; + import org.keycloak.admin.client.Keycloak; import org.keycloak.common.Version; import org.keycloak.crypto.Algorithm; @@ -35,7 +35,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.crypto.CryptoHelper; import org.keycloak.tests.utils.Assert; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/TimeOffsetTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/TimeOffsetTest.java index f15287265fd..68a4296e0a7 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/TimeOffsetTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/TimeOffsetTest.java @@ -16,8 +16,6 @@ */ package org.keycloak.tests.admin; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.common.util.Time; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; @@ -25,6 +23,9 @@ import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.testframework.remote.timeoffset.InjectTimeOffSet; import org.keycloak.testframework.remote.timeoffset.TimeOffSet; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class TimeOffsetTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/UsersTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/UsersTest.java index 681bf52bfc0..b7aeb1af0e8 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/UsersTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/UsersTest.java @@ -17,7 +17,8 @@ package org.keycloak.tests.admin; -import org.junit.jupiter.api.Test; +import java.util.List; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.FederatedIdentityModel; import org.keycloak.models.RealmModel; @@ -31,13 +32,13 @@ import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; -import java.util.List; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.not; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; @KeycloakIntegrationTest diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AbstractAuthenticationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AbstractAuthenticationTest.java index de201270ddd..0c2f02e358d 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AbstractAuthenticationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AbstractAuthenticationTest.java @@ -17,9 +17,12 @@ package org.keycloak.tests.admin.authentication; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.events.admin.OperationType; @@ -36,9 +39,8 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; /** diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AuthenticatorConfigTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AuthenticatorConfigTest.java index 26b9c059043..a267a8f557f 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AuthenticatorConfigTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AuthenticatorConfigTest.java @@ -17,9 +17,14 @@ package org.keycloak.tests.admin.authentication; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.authenticators.broker.IdpCreateUserIfUniqueAuthenticatorFactory; import org.keycloak.authentication.authenticators.broker.IdpDetectExistingBrokerUserAuthenticatorFactory; import org.keycloak.events.admin.OperationType; @@ -43,12 +48,9 @@ import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.admin.AdminEventPaths; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Marek Posolda diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ExecutionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ExecutionTest.java index b6842777b22..0430ebcbb78 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ExecutionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ExecutionTest.java @@ -17,11 +17,14 @@ package org.keycloak.tests.admin.authentication; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.authentication.AuthenticationFlow; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorFactory; @@ -34,12 +37,11 @@ import org.keycloak.representations.idm.AuthenticationFlowRepresentation; import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; +import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/FlowTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/FlowTest.java index 2f202f3acd7..6e568827947 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/FlowTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/FlowTest.java @@ -17,6 +17,19 @@ package org.keycloak.tests.admin.authentication; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.BiConsumer; +import java.util.function.Consumer; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.InternalServerErrorException; @@ -24,9 +37,7 @@ import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.hamcrest.MatcherAssert; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.CreatedResponseUtil; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.IdentityProviderResource; @@ -48,18 +59,12 @@ import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Supplier; -import java.util.stream.Collectors; +import org.hamcrest.MatcherAssert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.keycloak.tests.utils.matchers.Matchers.body; +import static org.keycloak.tests.utils.matchers.Matchers.statusCodeIs; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -68,8 +73,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import static org.keycloak.tests.utils.matchers.Matchers.body; -import static org.keycloak.tests.utils.matchers.Matchers.statusCodeIs; /** * @author Marko Strukelj diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/InitialFlowsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/InitialFlowsTest.java index f42a1764841..24180cb6c66 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/InitialFlowsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/InitialFlowsTest.java @@ -17,8 +17,13 @@ package org.keycloak.tests.admin.authentication; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.representations.idm.AuthenticationExecutionExportRepresentation; import org.keycloak.representations.idm.AuthenticationExecutionInfoRepresentation; @@ -27,12 +32,8 @@ import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.tests.utils.KerberosUtils; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Marko Strukelj diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ProvidersTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ProvidersTest.java index 5b450229a56..39c8044cb6a 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ProvidersTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ProvidersTest.java @@ -17,9 +17,16 @@ package org.keycloak.tests.admin.authentication; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.NotFoundException; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.Assertions; + import org.keycloak.authentication.authenticators.broker.IdpCreateUserIfUniqueAuthenticatorFactory; import org.keycloak.authentication.forms.RegistrationRecaptcha; import org.keycloak.authentication.forms.RegistrationRecaptchaEnterprise; @@ -29,13 +36,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.KerberosUtils; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/RegistrationFlowTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/RegistrationFlowTest.java index ca509fa5267..d85b290ffbb 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/RegistrationFlowTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/RegistrationFlowTest.java @@ -17,9 +17,11 @@ package org.keycloak.tests.admin.authentication; +import java.util.HashMap; +import java.util.Map; + import jakarta.ws.rs.BadRequestException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.representations.idm.AuthenticationFlowRepresentation; @@ -27,8 +29,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.tests.utils.admin.AdminEventPaths; -import java.util.HashMap; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Marek Posolda diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/RequiredActionsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/RequiredActionsTest.java index 92e5162f12d..95ec47d2213 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/RequiredActionsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/RequiredActionsTest.java @@ -17,8 +17,16 @@ package org.keycloak.tests.admin.authentication; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.NotFoundException; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.representations.idm.RequiredActionConfigInfoRepresentation; @@ -33,18 +41,12 @@ import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; +import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.testsuite.actions.DummyConfigurableRequiredActionFactory; import org.keycloak.testsuite.actions.DummyRequiredActionFactory; -import org.keycloak.tests.utils.admin.AdminEventPaths; -import jakarta.ws.rs.ClientErrorException; -import jakarta.ws.rs.NotFoundException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Marko Strukelj diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ShiftExecutionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ShiftExecutionTest.java index 727cc0c74e4..a8751572ed0 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ShiftExecutionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ShiftExecutionTest.java @@ -17,11 +17,13 @@ package org.keycloak.tests.admin.authentication; +import java.util.HashMap; +import java.util.List; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.representations.idm.AuthenticationExecutionInfoRepresentation; @@ -29,8 +31,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.tests.utils.admin.AdminEventPaths; -import java.util.HashMap; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Marko Strukelj diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ShiftRequiredActionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ShiftRequiredActionTest.java index fcfeb5f13b6..3a66f751d4e 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ShiftRequiredActionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/ShiftRequiredActionTest.java @@ -17,9 +17,10 @@ package org.keycloak.tests.admin.authentication; +import java.util.List; + import jakarta.ws.rs.NotFoundException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; @@ -27,7 +28,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.tests.utils.admin.AdminEventPaths; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Hiroyuki Wada diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/AbstractPermissionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/AbstractPermissionTest.java index ecf28da2c4c..710318204b5 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/AbstractPermissionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/AbstractPermissionTest.java @@ -17,17 +17,13 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import jakarta.ws.rs.core.Response; - import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.PermissionsResource; import org.keycloak.admin.client.resource.PoliciesResource; import org.keycloak.admin.client.resource.ScopePermissionsResource; @@ -48,6 +44,10 @@ import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.ManagedRealm; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.jupiter.api.Assertions.assertEquals; + public abstract class AbstractPermissionTest { @InjectRealm(config = RealmAdminPermissionsConfig.class, lifecycle = LifeCycle.METHOD) diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypeEvaluationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypeEvaluationTest.java index 0b75fb1a082..f42240c016c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypeEvaluationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypeEvaluationTest.java @@ -17,18 +17,6 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.instanceOf; -import static org.junit.Assert.fail; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.CLIENTS; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLES; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLES_COMPOSITE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; - import java.util.List; import java.util.Set; import java.util.function.Predicate; @@ -38,8 +26,7 @@ import java.util.stream.Collectors; import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -68,6 +55,22 @@ import org.keycloak.testframework.annotations.InjectClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedClient; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.CLIENTS; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLES; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLES_COMPOSITE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; + +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.instanceOf; +import static org.junit.Assert.fail; + @KeycloakIntegrationTest public class ClientResourceTypeEvaluationTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypeFilteringTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypeFilteringTest.java index 4e0fa0176ee..8d67f79bef1 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypeFilteringTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypeFilteringTest.java @@ -17,19 +17,11 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.CLIENTS_RESOURCE_TYPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; - import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.representations.idm.ClientRepresentation; @@ -38,6 +30,16 @@ import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.CLIENTS_RESOURCE_TYPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + @KeycloakIntegrationTest public class ClientResourceTypeFilteringTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypePermissionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypePermissionTest.java index d258a1d61be..d10dc014210 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypePermissionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/ClientResourceTypePermissionTest.java @@ -1,20 +1,9 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.jupiter.api.Assertions.assertEquals; - import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.ScopePermissionResource; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.representations.idm.ClientRepresentation; @@ -29,6 +18,19 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.realm.ManagedClient; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.jupiter.api.Assertions.assertEquals; + @KeycloakIntegrationTest public class ClientResourceTypePermissionTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FeatureV1EnabledTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FeatureV1EnabledTest.java index f4fe4c847b8..1b6b345199c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FeatureV1EnabledTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FeatureV1EnabledTest.java @@ -16,15 +16,17 @@ */ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import org.junit.jupiter.api.Test; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; import org.keycloak.testframework.annotations.InjectClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedClient; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; + @KeycloakIntegrationTest(config = KeycloakAdminPermissionsV1ServerConfig.class) public class FeatureV1EnabledTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FeatureV2EnabledTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FeatureV2EnabledTest.java index c445ec03077..cb338827706 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FeatureV2EnabledTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FeatureV2EnabledTest.java @@ -17,13 +17,7 @@ package org.keycloak.tests.admin.authz.fgap; import java.util.List; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import org.junit.jupiter.api.Test; + import org.keycloak.models.Constants; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; @@ -34,6 +28,15 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.ManagedRealm; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; + @KeycloakIntegrationTest public class FeatureV2EnabledTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FineGrainedPermissionsUsersTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FineGrainedPermissionsUsersTest.java index 75f4406d5cf..3d87cb513f7 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FineGrainedPermissionsUsersTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/FineGrainedPermissionsUsersTest.java @@ -1,12 +1,10 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.KeycloakBuilder; import org.keycloak.admin.client.resource.RealmResource; @@ -21,10 +19,14 @@ import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testframework.util.ApiUtil; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Set; +import org.junit.jupiter.api.Test; + +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; @KeycloakIntegrationTest diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeEvaluationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeEvaluationTest.java index 178682e8cd0..438f8351a05 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeEvaluationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeEvaluationTest.java @@ -17,32 +17,13 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.instanceOf; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.IMPERSONATE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.IMPERSONATE_MEMBERS; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE_GROUP_MEMBERSHIP; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE_MEMBERS; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE_MEMBERSHIP; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW_MEMBERS; +import java.util.List; +import java.util.Set; import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Set; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.GroupsResource; import org.keycloak.authorization.fgap.AdminPermissionsSchema; @@ -59,6 +40,28 @@ import org.keycloak.testframework.realm.ManagedUser; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.util.ApiUtil; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.IMPERSONATE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.IMPERSONATE_MEMBERS; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE_GROUP_MEMBERSHIP; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE_MEMBERS; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE_MEMBERSHIP; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW_MEMBERS; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.instanceOf; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + @KeycloakIntegrationTest public class GroupResourceTypeEvaluationTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeFilteringTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeFilteringTest.java index 194bddd3d98..7bcccf63936 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeFilteringTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypeFilteringTest.java @@ -17,21 +17,12 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; - import java.util.List; import java.util.Set; import java.util.stream.Collectors; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.GroupResource; import org.keycloak.representations.idm.GroupRepresentation; @@ -43,6 +34,18 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedUser; import org.keycloak.testframework.util.ApiUtil; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + @KeycloakIntegrationTest public class GroupResourceTypeFilteringTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypePermissionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypePermissionTest.java index 909a0387f4a..0c104dd1185 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypePermissionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/GroupResourceTypePermissionTest.java @@ -1,24 +1,12 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ScopePermissionResource; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.representations.idm.GroupRepresentation; @@ -33,6 +21,20 @@ import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.util.ApiUtil; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.jupiter.api.Assertions.assertEquals; + @KeycloakIntegrationTest public class GroupResourceTypePermissionTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/PermissionRESTTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/PermissionRESTTest.java index 0c2bc6df359..2272d8b35d0 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/PermissionRESTTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/PermissionRESTTest.java @@ -17,16 +17,11 @@ package org.keycloak.tests.admin.authz.fgap; +import java.util.Set; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; -import java.util.Set; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.fail; -import org.junit.jupiter.api.Test; + import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.authorization.DecisionStrategy; @@ -38,6 +33,15 @@ import org.keycloak.testframework.annotations.InjectUser; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedUser; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.fail; + @KeycloakIntegrationTest public class PermissionRESTTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RealmAdminAccessTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RealmAdminAccessTest.java index a818352adc3..33eaf9d6232 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RealmAdminAccessTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RealmAdminAccessTest.java @@ -17,18 +17,10 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.junit.jupiter.api.Assertions.fail; - import java.util.List; import jakarta.ws.rs.ForbiddenException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.models.AdminRoles; import org.keycloak.models.Constants; @@ -41,6 +33,16 @@ import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.InjectAdminClientFactory; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.junit.jupiter.api.Assertions.fail; + @KeycloakIntegrationTest public class RealmAdminAccessTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RealmRoleAdminTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RealmRoleAdminTest.java index fd708b4e3c8..f5f6c7b7565 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RealmRoleAdminTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RealmRoleAdminTest.java @@ -1,16 +1,11 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; - import java.util.List; import java.util.Map; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.models.AdminRoles; @@ -22,6 +17,13 @@ import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ClientConfigBuilder; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + @KeycloakIntegrationTest public class RealmRoleAdminTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypeEvaluationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypeEvaluationTest.java index e97e0791825..5cbb2f773b3 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypeEvaluationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypeEvaluationTest.java @@ -17,12 +17,16 @@ package org.keycloak.tests.admin.authz.fgap; +import java.util.List; +import java.util.Set; + import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ClientScopeResource; import org.keycloak.authorization.fgap.AdminPermissionsSchema; +import org.keycloak.models.AdminRoles; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation; import org.keycloak.representations.idm.RoleRepresentation; @@ -32,8 +36,13 @@ import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.util.ApiUtil; -import java.util.List; -import java.util.Set; +import org.junit.jupiter.api.Test; + +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLES; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE_CLIENT_SCOPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE_COMPOSITE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; @@ -41,12 +50,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.not; import static org.junit.jupiter.api.Assertions.fail; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLES; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE_CLIENT_SCOPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLE_COMPOSITE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; -import org.keycloak.models.AdminRoles; @KeycloakIntegrationTest public class RoleResourceTypeEvaluationTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypePermissionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypePermissionTest.java index d3933442537..175bd0710f6 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypePermissionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/RoleResourceTypePermissionTest.java @@ -1,23 +1,12 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.jupiter.api.Assertions.assertEquals; - -import jakarta.ws.rs.core.Response; import java.util.Arrays; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ScopePermissionResource; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.representations.idm.RoleRepresentation; @@ -33,6 +22,20 @@ import org.keycloak.testframework.annotations.InjectClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedClient; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.jupiter.api.Assertions.assertEquals; + @KeycloakIntegrationTest public class RoleResourceTypePermissionTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationSpecTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationSpecTest.java index 1b0ababa4ca..a97fcace4aa 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationSpecTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationSpecTest.java @@ -17,17 +17,6 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.is; -import static org.junit.jupiter.api.Assertions.fail; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE_MEMBERS; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW_MEMBERS; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -39,8 +28,7 @@ import java.util.function.Predicate; import java.util.stream.Stream; import jakarta.ws.rs.ForbiddenException; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.authorization.fgap.AdminPermissionsSchema; import org.keycloak.representations.idm.GroupRepresentation; @@ -58,6 +46,21 @@ import org.keycloak.testframework.annotations.InjectUser; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedUser; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE_MEMBERS; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW_MEMBERS; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.fail; + @KeycloakIntegrationTest public class UserResourceTypeEvaluationSpecTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationTest.java index d871caa939c..cc1dfcb230f 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeEvaluationTest.java @@ -17,28 +17,13 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.IMPERSONATE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE_GROUP_MEMBERSHIP; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLES; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.RESET_PASSWORD; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; - import java.util.List; import java.util.Set; import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.KeycloakBuilder; @@ -64,6 +49,24 @@ import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testframework.util.ApiUtil; +import org.junit.jupiter.api.Test; + +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.IMPERSONATE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MANAGE_GROUP_MEMBERSHIP; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.MAP_ROLES; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.RESET_PASSWORD; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + @KeycloakIntegrationTest public class UserResourceTypeEvaluationTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeFilteringTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeFilteringTest.java index 986b4c182b3..f30fde304d1 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeFilteringTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypeFilteringTest.java @@ -17,20 +17,6 @@ package org.keycloak.tests.admin.authz.fgap; -import static org.hamcrest.CoreMatchers.hasItems; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.not; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; -import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW_MEMBERS; - import java.util.HashSet; import java.util.List; import java.util.Set; @@ -42,9 +28,7 @@ import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.GenericType; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.KeycloakBuilder; @@ -67,10 +51,29 @@ import org.keycloak.testframework.annotations.InjectClient; import org.keycloak.testframework.annotations.InjectKeycloakUrls; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedClient; +import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testframework.util.ApiUtil; -import org.keycloak.testframework.realm.RoleConfigBuilder; + +import org.hamcrest.Matchers; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.GROUPS_RESOURCE_TYPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.USERS_RESOURCE_TYPE; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW; +import static org.keycloak.authorization.fgap.AdminPermissionsSchema.VIEW_MEMBERS; + +import static org.hamcrest.CoreMatchers.hasItems; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.not; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; @KeycloakIntegrationTest public class UserResourceTypeFilteringTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypePermissionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypePermissionTest.java index c100e7ebaa4..617001a99b8 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypePermissionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/authz/fgap/UserResourceTypePermissionTest.java @@ -17,6 +17,28 @@ package org.keycloak.tests.admin.authz.fgap; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import jakarta.ws.rs.NotFoundException; + +import org.keycloak.admin.client.resource.AuthorizationResource; +import org.keycloak.admin.client.resource.ScopePermissionResource; +import org.keycloak.authorization.fgap.AdminPermissionsSchema; +import org.keycloak.representations.idm.authorization.PolicyRepresentation; +import org.keycloak.representations.idm.authorization.ResourceRepresentation; +import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; +import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; +import org.keycloak.testframework.annotations.InjectUser; +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.keycloak.testframework.injection.LifeCycle; +import org.keycloak.testframework.realm.ManagedUser; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; @@ -32,25 +54,6 @@ import static org.hamcrest.Matchers.nullValue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import jakarta.ws.rs.NotFoundException; -import java.util.Arrays; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.keycloak.admin.client.resource.AuthorizationResource; -import org.keycloak.admin.client.resource.ScopePermissionResource; -import org.keycloak.authorization.fgap.AdminPermissionsSchema; -import org.keycloak.representations.idm.authorization.PolicyRepresentation; -import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; -import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; -import org.keycloak.testframework.annotations.InjectUser; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import org.keycloak.testframework.injection.LifeCycle; -import org.keycloak.testframework.realm.ManagedUser; - @KeycloakIntegrationTest public class UserResourceTypePermissionTest extends AbstractPermissionTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientScopeTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientScopeTest.java index 009cc827780..da9b85c9c34 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientScopeTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientScopeTest.java @@ -1,7 +1,10 @@ package org.keycloak.tests.admin.client; +import java.io.IOException; +import java.util.Map; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; + import org.keycloak.admin.client.resource.ClientScopesResource; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -17,8 +20,7 @@ import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.Map; +import org.junit.jupiter.api.Assertions; @KeycloakIntegrationTest public class AbstractClientScopeTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientSearchTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientSearchTest.java index 36b4ed845e3..d6146df21d1 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientSearchTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractClientSearchTest.java @@ -1,14 +1,14 @@ package org.keycloak.tests.admin.client; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; -import java.util.List; -import java.util.stream.Collectors; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractProtocolMapperTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractProtocolMapperTest.java index 360adfe7e67..a002a9daa6b 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractProtocolMapperTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/AbstractProtocolMapperTest.java @@ -17,8 +17,13 @@ package org.keycloak.tests.admin.client; -import com.fasterxml.jackson.core.type.TypeReference; -import org.junit.jupiter.api.Assertions; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ProtocolMappersResource; import org.keycloak.events.admin.OperationType; @@ -32,12 +37,8 @@ import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.events.AdminEvents; import org.keycloak.util.JsonSerialization; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.core.type.TypeReference; +import org.junit.jupiter.api.Assertions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientDescriptionConverterTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientDescriptionConverterTest.java index 69aec34bbed..c413ae93e50 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientDescriptionConverterTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientDescriptionConverterTest.java @@ -21,12 +21,13 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import org.apache.commons.io.IOUtils; -import org.junit.jupiter.api.Test; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedRealm; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Test; + /** * * @author hmlnarik diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientProtocolMapperTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientProtocolMapperTest.java index 1a196e2aa81..2cccedebac6 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientProtocolMapperTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientProtocolMapperTest.java @@ -19,11 +19,9 @@ package org.keycloak.tests.admin.client; import java.util.Collections; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ProtocolMappersResource; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -40,8 +38,11 @@ import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; /** * diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientRolesTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientRolesTest.java index 3481738b04a..d58c8a26d91 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientRolesTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientRolesTest.java @@ -17,10 +17,18 @@ package org.keycloak.tests.admin.client; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + import jakarta.ws.rs.ClientErrorException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.RoleByIdResource; import org.keycloak.admin.client.resource.RoleResource; @@ -39,20 +47,14 @@ import org.keycloak.testframework.realm.ClientConfig; import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.ManagedRealm; +import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; -import org.keycloak.testframework.realm.RoleConfigBuilder; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.IntStream; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeEvaluateTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeEvaluateTest.java index 0de386f6550..1e9fcfd4080 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeEvaluateTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeEvaluateTest.java @@ -17,7 +17,9 @@ package org.keycloak.tests.admin.client; -import org.junit.jupiter.api.Test; +import java.util.List; +import java.util.Map; + import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; import org.keycloak.representations.idm.UserSessionRepresentation; @@ -32,8 +34,7 @@ import org.keycloak.testframework.realm.UserConfig; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeProtocolMapperTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeProtocolMapperTest.java index 98741a7736e..264d8244fc0 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeProtocolMapperTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeProtocolMapperTest.java @@ -20,10 +20,9 @@ package org.keycloak.tests.admin.client; import java.util.List; import java.util.Map; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ClientScopeResource; import org.keycloak.admin.client.resource.ClientScopesResource; import org.keycloak.admin.client.resource.ProtocolMappersResource; @@ -39,11 +38,13 @@ import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.realm.ManagedRealm; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; +import org.keycloak.tests.utils.admin.ApiUtil; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Marek Posolda diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTest.java index 8987e5ccb08..462226f971f 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTest.java @@ -17,16 +17,20 @@ package org.keycloak.tests.admin.client; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.stream.Collectors; + import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ProtocolMappersResource; import org.keycloak.admin.client.resource.RealmResource; @@ -47,21 +51,20 @@ import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; +import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.tests.utils.matchers.Matchers; -import org.keycloak.testframework.realm.RoleConfigBuilder; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; -import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +import static org.keycloak.tests.utils.Assert.assertNames; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.tests.utils.Assert.assertNames; /** * @author Marek Posolda diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTestOid4Vci.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTestOid4Vci.java index 41345820238..7c61f0a8875 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTestOid4Vci.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientScopeTestOid4Vci.java @@ -18,11 +18,12 @@ package org.keycloak.tests.admin.client; +import java.util.Map; +import java.util.Optional; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; + import org.keycloak.common.Profile; import org.keycloak.constants.Oid4VciConstants; import org.keycloak.models.oid4vci.CredentialScopeModel; @@ -31,8 +32,9 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import java.util.Map; -import java.util.Optional; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; /** * @author Pascal Knüppel diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientSearchJpaTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientSearchJpaTest.java index f4880a0dc96..9218532a533 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientSearchJpaTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientSearchJpaTest.java @@ -19,10 +19,12 @@ package org.keycloak.tests.admin.client; import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Test; + import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.tests.utils.matchers.Matchers; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientSearchTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientSearchTest.java index 4048af09f16..b03cad8abe4 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientSearchTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ClientSearchTest.java @@ -19,12 +19,14 @@ package org.keycloak.tests.admin.client; import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Test; + import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.tests.utils.matchers.Matchers; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/CredentialsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/CredentialsTest.java index f1a42ed24aa..ecc99307ef3 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/CredentialsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/CredentialsTest.java @@ -17,9 +17,16 @@ package org.keycloak.tests.admin.client; -import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; +import java.io.ByteArrayInputStream; +import java.io.FileInputStream; +import java.nio.charset.StandardCharsets; +import java.security.Key; +import java.security.KeyStore; +import java.security.cert.Certificate; +import java.security.cert.X509Certificate; + +import jakarta.ws.rs.core.MediaType; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ClientAttributeCertificateResource; import org.keycloak.common.crypto.CryptoIntegration; @@ -43,17 +50,11 @@ import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.tests.utils.admin.AdminEventPaths; - -import jakarta.ws.rs.core.MediaType; import org.keycloak.tests.utils.admin.GenerateKeystoreForTestUtil; -import java.io.ByteArrayInputStream; -import java.io.FileInputStream; -import java.nio.charset.StandardCharsets; -import java.security.Key; -import java.security.KeyStore; -import java.security.cert.Certificate; -import java.security.cert.X509Certificate; +import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/DynamicClientScopeTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/DynamicClientScopeTest.java index fc95f42fe99..ebfeb597fb1 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/DynamicClientScopeTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/DynamicClientScopeTest.java @@ -1,9 +1,10 @@ package org.keycloak.tests.admin.client; +import java.util.HashMap; + import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.common.Profile; import org.keycloak.models.ClientScopeModel; @@ -14,7 +15,8 @@ import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.tests.utils.matchers.Matchers; -import java.util.HashMap; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.equalTo; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/InstallationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/InstallationTest.java index edb51fc45a5..b384604fe63 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/InstallationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/InstallationTest.java @@ -32,8 +32,7 @@ import javax.xml.parsers.ParserConfigurationException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.protocol.oidc.OIDCLoginProtocol; @@ -62,20 +61,23 @@ import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.KeyUtils; import org.keycloak.tests.utils.admin.AdminEventPaths; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; import org.xml.sax.SAXException; +import static org.keycloak.common.Profile.Feature.AUTHORIZATION; +import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.METADATA_NSURI; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import static org.keycloak.common.Profile.Feature.AUTHORIZATION; - -import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.METADATA_NSURI; /** * Test getting the installation/configuration files for OIDC and SAML. diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/ServiceAccountClientTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/ServiceAccountClientTest.java index e4e423240fd..80566906be6 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/ServiceAccountClientTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/ServiceAccountClientTest.java @@ -17,10 +17,8 @@ package org.keycloak.tests.admin.client; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.stream.Collectors; + import org.keycloak.admin.client.resource.ClientScopeResource; import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.representations.AccessToken; @@ -38,7 +36,10 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.stream.Collectors; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author rmartinc diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/client/SessionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/client/SessionTest.java index 4124ec1c257..a0ea2c33f9a 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/client/SessionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/client/SessionTest.java @@ -17,7 +17,8 @@ package org.keycloak.tests.admin.client; -import org.junit.jupiter.api.Test; +import java.util.List; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation; @@ -35,7 +36,7 @@ import org.keycloak.testframework.ui.page.LoginPage; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.AccountHelper; -import java.util.List; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/AbstractConcurrencyTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/AbstractConcurrencyTest.java index 5cde4679b6d..5ec0416c6ef 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/AbstractConcurrencyTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/AbstractConcurrencyTest.java @@ -17,7 +17,19 @@ package org.keycloak.tests.admin.concurrency; -import org.jboss.logging.Logger; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; @@ -27,18 +39,7 @@ import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.config.Config; import org.keycloak.testframework.realm.ManagedRealm; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; +import org.jboss.logging.Logger; /** * @author Stian Thorgersen diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrencyTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrencyTest.java index 5ba87cd956c..94cbf4bb78d 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrencyTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrencyTest.java @@ -17,8 +17,15 @@ package org.keycloak.tests.admin.concurrency; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.IntStream; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -29,21 +36,14 @@ import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.RoleRepresentation; - -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; - import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.IntStream; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrentLoginTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrentLoginTest.java index a2b396dea53..1a695da43e5 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrentLoginTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/concurrency/ConcurrentLoginTest.java @@ -22,30 +22,24 @@ import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Random; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicReference; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; import jakarta.ws.rs.core.Response; -import org.apache.http.Header; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.utils.URLEncodedUtils; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import org.jboss.logging.Logger; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.common.util.Retry; import org.keycloak.jose.jws.JWSInput; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.oidc.OIDCConfigAttributes; @@ -53,7 +47,6 @@ import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.common.util.Retry; import org.keycloak.testframework.annotations.InjectKeycloakUrls; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.InjectUser; @@ -71,18 +64,27 @@ import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.Random; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.regex.Pattern; -import java.util.regex.Matcher; -import java.util.stream.Collectors; -import org.hamcrest.Matchers; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.util.JsonSerialization; + +import org.apache.http.Header; +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; +import org.hamcrest.Matchers; +import org.jboss.logging.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventAuthDetailsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventAuthDetailsTest.java index 548063c3b25..d8ce5efba8c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventAuthDetailsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventAuthDetailsTest.java @@ -17,9 +17,6 @@ package org.keycloak.tests.admin.event; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -35,8 +32,12 @@ import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; +import org.keycloak.tests.utils.admin.ApiUtil; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.opentest4j.AssertionFailedError; /** diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventTest.java index 47a7aafcaa1..dadaff1b5d1 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/event/AdminEventTest.java @@ -17,10 +17,14 @@ package org.keycloak.tests.admin.event; -import org.apache.commons.lang3.RandomStringUtils; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.time.Instant; +import java.time.LocalDate; +import java.time.ZoneOffset; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; @@ -50,13 +54,10 @@ import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.time.Instant; -import java.time.LocalDate; -import java.time.ZoneOffset; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import org.apache.commons.lang3.RandomStringUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/event/EmailEventListenerTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/event/EmailEventListenerTest.java index e3fdc8f35a7..a643eac4cb4 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/event/EmailEventListenerTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/event/EmailEventListenerTest.java @@ -19,8 +19,7 @@ package org.keycloak.tests.admin.event; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.events.email.EmailEventListenerProviderFactory; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.InjectUser; @@ -36,6 +35,9 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.realm.UserConfig; import org.keycloak.testframework.realm.UserConfigBuilder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class EmailEventListenerTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/event/EventConfigTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/event/EventConfigTest.java index 0e8c0aec35b..27d016cf366 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/event/EventConfigTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/event/EventConfigTest.java @@ -17,9 +17,8 @@ package org.keycloak.tests.admin.event; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import java.util.List; + import org.keycloak.representations.idm.RealmEventsConfigRepresentation; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; @@ -27,7 +26,9 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test updates to the events configuration. diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/event/LoginEventsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/event/LoginEventsTest.java index a1a06294694..e858a568bb6 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/event/LoginEventsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/event/LoginEventsTest.java @@ -17,9 +17,12 @@ package org.keycloak.tests.admin.event; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import java.time.Instant; +import java.time.LocalDate; +import java.time.ZoneOffset; +import java.util.List; +import java.util.Map; + import org.keycloak.events.Event; import org.keycloak.events.EventStoreProvider; import org.keycloak.events.EventType; @@ -35,11 +38,9 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; -import java.time.Instant; -import java.time.LocalDate; -import java.time.ZoneOffset; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/AbstractFineGrainedAdminTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/AbstractFineGrainedAdminTest.java index 73d9cd87de5..95eac588cf6 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/AbstractFineGrainedAdminTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/AbstractFineGrainedAdminTest.java @@ -1,7 +1,5 @@ package org.keycloak.tests.admin.finegrainedadminv1; -import org.jboss.logging.Logger; -import org.junit.jupiter.api.Assertions; import org.keycloak.admin.client.Keycloak; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; @@ -35,6 +33,9 @@ import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; +import org.jboss.logging.Logger; +import org.junit.jupiter.api.Assertions; + public class AbstractFineGrainedAdminTest { @InjectRealm(lifecycle = LifeCycle.METHOD) diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminDefaultRealmTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminDefaultRealmTest.java index 487ceadabbc..90a073cd2e5 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminDefaultRealmTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminDefaultRealmTest.java @@ -1,7 +1,8 @@ package org.keycloak.tests.admin.finegrainedadminv1; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.admin.client.Keycloak; import org.keycloak.authorization.model.Resource; import org.keycloak.models.AdminRoles; @@ -20,8 +21,8 @@ import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import java.util.LinkedList; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest(config = AbstractFineGrainedAdminTest.FineGrainedAdminServerConf.class) public class FineGrainedAdminDefaultRealmTest extends AbstractFineGrainedAdminTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminMasterRealmTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminMasterRealmTest.java index 0fc55910dfb..2804a97a2b7 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminMasterRealmTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminMasterRealmTest.java @@ -1,8 +1,11 @@ package org.keycloak.tests.admin.finegrainedadminv1; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.models.AdminRoles; import org.keycloak.models.Constants; @@ -12,9 +15,8 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminRestTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminRestTest.java index c1fbfa72930..929dbe180e6 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminRestTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminRestTest.java @@ -16,11 +16,13 @@ */ package org.keycloak.tests.admin.finegrainedadminv1; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + +import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.Response; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.models.Constants; import org.keycloak.representations.idm.ClientRepresentation; @@ -32,11 +34,10 @@ import org.keycloak.testframework.realm.GroupConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.tests.utils.admin.ApiUtil; -import jakarta.ws.rs.ClientErrorException; - -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Bill Burke diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminSearchTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminSearchTest.java index def5d36314f..c9299372ff5 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminSearchTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminSearchTest.java @@ -1,8 +1,10 @@ package org.keycloak.tests.admin.finegrainedadminv1; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.admin.client.Keycloak; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; @@ -24,10 +26,9 @@ import org.keycloak.services.resources.admin.fgap.ClientPermissionManagement; import org.keycloak.services.resources.admin.fgap.GroupPermissionManagement; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminWithTokenExchangeDisabledTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminWithTokenExchangeDisabledTest.java index 5ce605a555a..1eb20e754da 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminWithTokenExchangeDisabledTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminWithTokenExchangeDisabledTest.java @@ -1,8 +1,9 @@ package org.keycloak.tests.admin.finegrainedadminv1; -import org.junit.jupiter.api.Test; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest(config = AbstractFineGrainedAdminTest.FineGrainedAdminServerConf.class) public class FineGrainedAdminWithTokenExchangeDisabledTest extends AbstractFineGrainedAdminTest{ diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminWithTokenExchangeTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminWithTokenExchangeTest.java index c36b9f91ef7..d04120f9247 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminWithTokenExchangeTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedAdminWithTokenExchangeTest.java @@ -1,7 +1,5 @@ package org.keycloak.tests.admin.finegrainedadminv1; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.common.Profile; import org.keycloak.models.Constants; @@ -9,6 +7,9 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest(config = FineGrainedAdminWithTokenExchangeTest.FineGrainedWithTokenExchangeServerConf.class) public class FineGrainedAdminWithTokenExchangeTest extends AbstractFineGrainedAdminTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedPermissionsV1UsersTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedPermissionsV1UsersTest.java index bbc31db67dd..454c8e686a9 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedPermissionsV1UsersTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/finegrainedadminv1/FineGrainedPermissionsV1UsersTest.java @@ -1,6 +1,15 @@ package org.keycloak.tests.admin.finegrainedadminv1; -import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.KeycloakBuilder; import org.keycloak.admin.client.resource.AuthorizationResource; @@ -23,15 +32,7 @@ import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testframework.util.ApiUtil; -import java.io.IOException; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Optional; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/group/AbstractGroupTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/group/AbstractGroupTest.java index 65b12a8ac05..8d0eae52c5b 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/group/AbstractGroupTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/group/AbstractGroupTest.java @@ -18,6 +18,7 @@ package org.keycloak.tests.admin.group; import jakarta.ws.rs.core.Response; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.representations.AccessToken; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupAttributeSearchTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupAttributeSearchTest.java index ccfa3ba94b9..99e3fd9d108 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupAttributeSearchTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupAttributeSearchTest.java @@ -1,8 +1,11 @@ package org.keycloak.tests.admin.group; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.GroupResource; import org.keycloak.admin.client.resource.GroupsResource; import org.keycloak.representations.idm.GroupRepresentation; @@ -13,9 +16,8 @@ import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupMappersTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupMappersTest.java index c38c466d727..edf107c95ca 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupMappersTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupMappersTest.java @@ -17,11 +17,14 @@ package org.keycloak.tests.admin.group; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.core.Response; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ProtocolMappersResource; import org.keycloak.admin.client.resource.RealmResource; @@ -46,11 +49,10 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.ProtocolMapperUtil; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Marko Strukelj diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupSearchTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupSearchTest.java index 61d5e426bd5..479d651c375 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupSearchTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupSearchTest.java @@ -1,10 +1,15 @@ package org.keycloak.tests.admin.group; -import com.google.common.collect.Comparators; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.Response; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.GroupResource; import org.keycloak.admin.client.resource.GroupsResource; import org.keycloak.admin.client.resource.RealmResource; @@ -23,13 +28,10 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.stream.Collectors; +import com.google.common.collect.Comparators; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupTest.java index fd2eef81a73..67c316414aa 100755 --- a/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/group/GroupTest.java @@ -17,17 +17,23 @@ package org.keycloak.tests.admin.group; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.IntStream; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.GroupResource; import org.keycloak.admin.client.resource.GroupsResource; @@ -61,26 +67,22 @@ import org.keycloak.testframework.realm.GroupConfigBuilder; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; +import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; -import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.stream.IntStream; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anEmptyMap; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/AbstractIdentityProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/AbstractIdentityProviderTest.java index 40f25a5771b..c47be21b12a 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/AbstractIdentityProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/AbstractIdentityProviderTest.java @@ -1,6 +1,7 @@ package org.keycloak.tests.admin.identityprovider; -import org.junit.jupiter.api.Assertions; +import java.util.Map; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.IdentityProviderModel; @@ -16,7 +17,7 @@ import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.Map; +import org.junit.jupiter.api.Assertions; public class AbstractIdentityProviderTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderMapperTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderMapperTest.java index a789e81cebd..1a10f00bb37 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderMapperTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderMapperTest.java @@ -1,9 +1,15 @@ package org.keycloak.tests.admin.identityprovider; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -22,12 +28,8 @@ import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.broker.oidc.OverwrittenMappersTestIdentityProviderFactory; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderOidcTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderOidcTest.java index 8cffc2428f8..652b46a6394 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderOidcTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderOidcTest.java @@ -17,21 +17,11 @@ package org.keycloak.tests.admin.identityprovider; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.hasEntry; -import static org.hamcrest.Matchers.not; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - import java.util.UUID; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.common.enums.SslRequired; import org.keycloak.events.admin.OperationType; @@ -46,11 +36,22 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.tests.utils.admin.AdminEventPaths; - -import jakarta.ws.rs.ClientErrorException; -import jakarta.ws.rs.core.Response; import org.keycloak.testsuite.util.broker.OIDCIdentityProviderConfigRep; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.hasEntry; +import static org.hamcrest.Matchers.not; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + /** * @author Stian Thorgersen */ diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderSamlTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderSamlTest.java index 5bdda3489dd..f28cf23995c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderSamlTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderSamlTest.java @@ -1,12 +1,31 @@ package org.keycloak.tests.admin.identityprovider; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.security.PublicKey; +import java.security.cert.CertificateEncodingException; +import java.security.cert.X509Certificate; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import javax.xml.crypto.dsig.XMLSignature; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.dom.saml.v2.metadata.EndpointType; @@ -37,30 +56,15 @@ import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.KeyUtils; import org.keycloak.tests.utils.admin.AdminEventPaths; + +import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import javax.xml.crypto.dsig.XMLSignature; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.security.PublicKey; -import java.security.cert.CertificateEncodingException; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Base64; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.XMLDSIG_NSURI; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -71,7 +75,6 @@ import static org.hamcrest.Matchers.notNullValue; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.XMLDSIG_NSURI; @KeycloakIntegrationTest public class IdentityProviderSamlTest extends AbstractIdentityProviderTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderTest.java index 32a9a17a4a7..e0e2feb1647 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderTest.java @@ -1,8 +1,11 @@ package org.keycloak.tests.admin.identityprovider; +import java.util.Collections; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.IdentityProviderStorageProvider; import org.keycloak.representations.idm.IdentityProviderRepresentation; @@ -12,9 +15,8 @@ import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.tests.utils.Assert; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderTypeTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderTypeTest.java index 905adb00e08..998c7847538 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderTypeTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/identityprovider/IdentityProviderTypeTest.java @@ -1,15 +1,14 @@ package org.keycloak.tests.admin.identityprovider; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Test; -import org.keycloak.models.IdentityProviderCapability; -import org.keycloak.models.IdentityProviderType; +import java.util.List; + import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; import org.keycloak.broker.saml.SAMLIdentityProviderFactory; import org.keycloak.broker.spiffe.SpiffeIdentityProviderConfig; import org.keycloak.broker.spiffe.SpiffeIdentityProviderFactory; +import org.keycloak.models.IdentityProviderCapability; import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.IdentityProviderType; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; @@ -21,7 +20,9 @@ import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.tests.client.authentication.external.SpiffeClientAuthTest; import org.keycloak.testsuite.util.IdentityProviderBuilder; -import java.util.List; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest(config = SpiffeClientAuthTest.SpiffeServerConfig.class) public class IdentityProviderTypeTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/metric/PasswordValidationMetricCustomTagsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/metric/PasswordValidationMetricCustomTagsTest.java index d0d74eecef9..d11b304450a 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/metric/PasswordValidationMetricCustomTagsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/metric/PasswordValidationMetricCustomTagsTest.java @@ -1,10 +1,9 @@ package org.keycloak.tests.admin.metric; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.util.EntityUtils; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.keycloak.testframework.annotations.InjectHttpClient; import org.keycloak.testframework.annotations.InjectKeycloakUrls; import org.keycloak.testframework.annotations.InjectRealm; @@ -22,9 +21,11 @@ import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.io.IOException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.util.EntityUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest(config = PasswordValidationMetricCustomTagsTest.ServerConfigWithMetrics.class) public class PasswordValidationMetricCustomTagsTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/metric/PasswordValidationMetricTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/metric/PasswordValidationMetricTest.java index 78361cc0f84..154344ebe54 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/metric/PasswordValidationMetricTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/metric/PasswordValidationMetricTest.java @@ -1,10 +1,9 @@ package org.keycloak.tests.admin.metric; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.util.EntityUtils; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.keycloak.testframework.annotations.InjectHttpClient; import org.keycloak.testframework.annotations.InjectKeycloakUrls; import org.keycloak.testframework.annotations.InjectRealm; @@ -22,11 +21,13 @@ import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import org.openqa.selenium.WebDriver; -import java.io.IOException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.util.EntityUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.WebDriver; @KeycloakIntegrationTest(config = PasswordValidationMetricTest.ServerConfigWithMetrics.class) public class PasswordValidationMetricTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AbstractWorkflowTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AbstractWorkflowTest.java index 3492e996514..e17a0366823 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AbstractWorkflowTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AbstractWorkflowTest.java @@ -15,6 +15,7 @@ import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.LoginPage; + import org.openqa.selenium.WebDriver; public abstract class AbstractWorkflowTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AddRequiredActionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AddRequiredActionTest.java index 4775df30191..8122fac2ff2 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AddRequiredActionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AddRequiredActionTest.java @@ -1,22 +1,24 @@ package org.keycloak.tests.admin.model.workflow; +import java.time.Duration; + +import org.keycloak.models.UserModel; +import org.keycloak.models.workflow.AddRequiredActionStepProvider; +import org.keycloak.models.workflow.AddRequiredActionStepProviderFactory; +import org.keycloak.representations.workflows.WorkflowRepresentation; +import org.keycloak.representations.workflows.WorkflowStepRepresentation; +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.keycloak.testframework.realm.UserConfigBuilder; + import org.awaitility.Awaitility; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.keycloak.models.UserModel; -import org.keycloak.models.workflow.AddRequiredActionStepProvider; -import org.keycloak.models.workflow.AddRequiredActionStepProviderFactory; -import org.keycloak.representations.workflows.WorkflowStepRepresentation; -import org.keycloak.representations.workflows.WorkflowRepresentation; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import org.keycloak.testframework.realm.UserConfigBuilder; -import java.time.Duration; +import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; -import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; @KeycloakIntegrationTest(config = WorkflowsBlockingServerConfig.class) public class AddRequiredActionTest extends AbstractWorkflowTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AdhocWorkflowTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AdhocWorkflowTest.java index 53f2c13539b..e2346c48006 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AdhocWorkflowTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/AdhocWorkflowTest.java @@ -1,20 +1,11 @@ package org.keycloak.tests.admin.model.workflow; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasItems; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; - import java.time.Duration; import java.util.List; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Test; + import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.workflow.NotifyUserStepProviderFactory; @@ -28,6 +19,18 @@ import org.keycloak.representations.workflows.WorkflowStepRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.util.ApiUtil; +import org.junit.jupiter.api.Test; + +import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + @KeycloakIntegrationTest(config = WorkflowsBlockingServerConfig.class) public class AdhocWorkflowTest extends AbstractWorkflowTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/BrokeredUserSessionRefreshTimeWorkflowTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/BrokeredUserSessionRefreshTimeWorkflowTest.java index 9185f9271e1..61ac8369227 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/BrokeredUserSessionRefreshTimeWorkflowTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/BrokeredUserSessionRefreshTimeWorkflowTest.java @@ -17,28 +17,10 @@ package org.keycloak.tests.admin.model.workflow; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; -import static org.keycloak.models.workflow.ResourceOperationType.USER_LOGGED_IN; - import java.time.Duration; import java.util.List; import java.util.Map; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -51,9 +33,9 @@ import org.keycloak.models.workflow.conditions.IdentityProviderWorkflowCondition import org.keycloak.representations.idm.FederatedIdentityRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.representations.workflows.WorkflowRepresentation; import org.keycloak.representations.workflows.WorkflowStateRepresentation; import org.keycloak.representations.workflows.WorkflowStepRepresentation; -import org.keycloak.representations.workflows.WorkflowRepresentation; import org.keycloak.testframework.annotations.InjectClient; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.InjectUser; @@ -76,8 +58,28 @@ import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.ConsentPage; import org.keycloak.testframework.ui.page.LoginPage; + +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.openqa.selenium.WebDriver; +import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; +import static org.keycloak.models.workflow.ResourceOperationType.USER_LOGGED_IN; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** */ @KeycloakIntegrationTest(config = WorkflowsBlockingServerConfig.class) diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/DeleteUserWorkflowStepTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/DeleteUserWorkflowStepTest.java index 82aae8c03fb..48f2b7a62aa 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/DeleteUserWorkflowStepTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/DeleteUserWorkflowStepTest.java @@ -17,20 +17,12 @@ package org.keycloak.tests.admin.model.workflow; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.models.workflow.DeleteUserStepProvider.PROPAGATE_TO_SP; - -import jakarta.ws.rs.core.Response; import java.time.Duration; import java.util.List; import java.util.stream.Stream; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; + +import jakarta.ws.rs.core.Response; + import org.keycloak.component.ComponentModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -61,8 +53,20 @@ import org.keycloak.tests.admin.model.workflow.DeleteUserWorkflowStepTest.Delete import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.federation.DummyUserFederationProvider; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.openqa.selenium.WebDriver; +import static org.keycloak.models.workflow.DeleteUserStepProvider.PROPAGATE_TO_SP; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** */ @KeycloakIntegrationTest(config = DeleteUserWorkflowServerConf.class) diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/ExpressionConditionWorkflowTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/ExpressionConditionWorkflowTest.java index 68b7f30bd67..47a2f532a7c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/ExpressionConditionWorkflowTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/ExpressionConditionWorkflowTest.java @@ -1,8 +1,11 @@ package org.keycloak.tests.admin.model.workflow; +import java.time.Duration; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.RolesResource; import org.keycloak.admin.client.resource.WorkflowsResource; import org.keycloak.models.RealmModel; @@ -20,9 +23,8 @@ import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.util.ApiUtil; -import java.time.Duration; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/GroupMembershipJoinWorkflowTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/GroupMembershipJoinWorkflowTest.java index 8254648d47c..2c53c8ac525 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/GroupMembershipJoinWorkflowTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/GroupMembershipJoinWorkflowTest.java @@ -1,5 +1,35 @@ package org.keycloak.tests.admin.model.workflow; +import java.time.Duration; +import java.util.List; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + +import org.keycloak.admin.client.resource.UserResource; +import org.keycloak.admin.client.resource.WorkflowsResource; +import org.keycloak.models.workflow.NotifyUserStepProviderFactory; +import org.keycloak.models.workflow.ResourceOperationType; +import org.keycloak.models.workflow.SetUserAttributeStepProviderFactory; +import org.keycloak.models.workflow.conditions.GroupMembershipWorkflowConditionFactory; +import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.representations.userprofile.config.UPConfig; +import org.keycloak.representations.userprofile.config.UPConfig.UnmanagedAttributePolicy; +import org.keycloak.representations.workflows.WorkflowRepresentation; +import org.keycloak.representations.workflows.WorkflowSetRepresentation; +import org.keycloak.representations.workflows.WorkflowStateRepresentation; +import org.keycloak.representations.workflows.WorkflowStepRepresentation; +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.keycloak.testframework.realm.GroupConfigBuilder; +import org.keycloak.testframework.realm.UserConfigBuilder; +import org.keycloak.testframework.util.ApiUtil; + +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Test; + +import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; +import static org.keycloak.models.workflow.ResourceOperationType.USER_LOGGED_IN; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; @@ -8,33 +38,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; -import static org.keycloak.models.workflow.ResourceOperationType.USER_LOGGED_IN; - -import java.time.Duration; -import java.util.List; - -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; -import org.awaitility.Awaitility; -import org.junit.jupiter.api.Test; -import org.keycloak.admin.client.resource.UserResource; -import org.keycloak.admin.client.resource.WorkflowsResource; -import org.keycloak.models.workflow.NotifyUserStepProviderFactory; -import org.keycloak.models.workflow.SetUserAttributeStepProviderFactory; -import org.keycloak.models.workflow.conditions.GroupMembershipWorkflowConditionFactory; -import org.keycloak.models.workflow.ResourceOperationType; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.representations.workflows.WorkflowSetRepresentation; -import org.keycloak.representations.workflows.WorkflowStateRepresentation; -import org.keycloak.representations.workflows.WorkflowStepRepresentation; -import org.keycloak.representations.workflows.WorkflowRepresentation; -import org.keycloak.representations.userprofile.config.UPConfig; -import org.keycloak.representations.userprofile.config.UPConfig.UnmanagedAttributePolicy; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import org.keycloak.testframework.realm.GroupConfigBuilder; -import org.keycloak.testframework.realm.UserConfigBuilder; -import org.keycloak.testframework.util.ApiUtil; @KeycloakIntegrationTest(config = WorkflowsBlockingServerConfig.class) public class GroupMembershipJoinWorkflowTest extends AbstractWorkflowTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/RoleWorkflowConditionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/RoleWorkflowConditionTest.java index 4a51182922a..54d07b1700e 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/RoleWorkflowConditionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/RoleWorkflowConditionTest.java @@ -1,18 +1,11 @@ package org.keycloak.tests.admin.model.workflow; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.time.Duration; import java.util.List; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.RolesResource; import org.keycloak.admin.client.resource.WorkflowsResource; import org.keycloak.models.RealmModel; @@ -23,16 +16,25 @@ import org.keycloak.models.workflow.SetUserAttributeStepProviderFactory; import org.keycloak.models.workflow.conditions.RoleWorkflowConditionFactory; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RoleRepresentation; -import org.keycloak.representations.workflows.WorkflowSetRepresentation; -import org.keycloak.representations.workflows.WorkflowStepRepresentation; -import org.keycloak.representations.workflows.WorkflowRepresentation; import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.representations.userprofile.config.UPConfig.UnmanagedAttributePolicy; +import org.keycloak.representations.workflows.WorkflowRepresentation; +import org.keycloak.representations.workflows.WorkflowSetRepresentation; +import org.keycloak.representations.workflows.WorkflowStepRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.util.ApiUtil; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + @KeycloakIntegrationTest(config = WorkflowsBlockingServerConfig.class) public class RoleWorkflowConditionTest extends AbstractWorkflowTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/StepRunnerScheduledTaskTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/StepRunnerScheduledTaskTest.java index c1c80dc0f32..363e6044b8a 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/StepRunnerScheduledTaskTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/StepRunnerScheduledTaskTest.java @@ -17,14 +17,10 @@ package org.keycloak.tests.admin.model.workflow; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; - import java.time.Duration; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.util.Time; @@ -34,17 +30,23 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserProvider; import org.keycloak.models.workflow.DisableUserStepProviderFactory; -import org.keycloak.models.workflow.WorkflowStepRunnerSuccessEvent; import org.keycloak.models.workflow.SetUserAttributeStepProviderFactory; +import org.keycloak.models.workflow.WorkflowStepRunnerSuccessEvent; import org.keycloak.provider.ProviderEventListener; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.representations.workflows.WorkflowStepRepresentation; import org.keycloak.representations.workflows.WorkflowRepresentation; +import org.keycloak.representations.workflows.WorkflowStepRepresentation; import org.keycloak.storage.UserStoragePrivateUtil; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.UserConfigBuilder; +import org.junit.jupiter.api.Test; + +import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; + +import static org.junit.jupiter.api.Assertions.assertTrue; + @KeycloakIntegrationTest(config = WorkflowsScheduledTaskServerConfig.class) public class StepRunnerScheduledTaskTest extends AbstractWorkflowTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserAttributeWorkflowConditionTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserAttributeWorkflowConditionTest.java index 6efea800258..0ca37bdccea 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserAttributeWorkflowConditionTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserAttributeWorkflowConditionTest.java @@ -1,11 +1,5 @@ package org.keycloak.tests.admin.model.workflow; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.time.Duration; import java.util.HashMap; import java.util.List; @@ -13,8 +7,7 @@ import java.util.Map; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.WorkflowsResource; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -22,14 +15,23 @@ import org.keycloak.models.workflow.ResourceOperationType; import org.keycloak.models.workflow.RestartWorkflowStepProviderFactory; import org.keycloak.models.workflow.SetUserAttributeStepProviderFactory; import org.keycloak.models.workflow.conditions.UserAttributeWorkflowConditionFactory; -import org.keycloak.representations.workflows.WorkflowSetRepresentation; -import org.keycloak.representations.workflows.WorkflowStepRepresentation; -import org.keycloak.representations.workflows.WorkflowRepresentation; import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.representations.userprofile.config.UPConfig.UnmanagedAttributePolicy; +import org.keycloak.representations.workflows.WorkflowRepresentation; +import org.keycloak.representations.workflows.WorkflowSetRepresentation; +import org.keycloak.representations.workflows.WorkflowStepRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.UserConfigBuilder; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + @KeycloakIntegrationTest(config = WorkflowsBlockingServerConfig.class) public class UserAttributeWorkflowConditionTest extends AbstractWorkflowTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserResourceTypeSelectorTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserResourceTypeSelectorTest.java index 7684b5b4c6f..8328c39bf32 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserResourceTypeSelectorTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserResourceTypeSelectorTest.java @@ -1,7 +1,10 @@ package org.keycloak.tests.admin.model.workflow; +import java.time.Duration; +import java.util.List; + import jakarta.mail.internet.MimeMessage; -import org.junit.jupiter.api.Test; + import org.keycloak.common.util.Time; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -9,21 +12,21 @@ import org.keycloak.models.workflow.DisableUserStepProviderFactory; import org.keycloak.models.workflow.NotifyUserStepProviderFactory; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.representations.workflows.WorkflowStepRepresentation; import org.keycloak.representations.workflows.WorkflowRepresentation; +import org.keycloak.representations.workflows.WorkflowStepRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.mail.MailServer; import org.keycloak.testframework.mail.annotations.InjectMailServer; -import java.time.Duration; -import java.util.List; +import org.junit.jupiter.api.Test; + +import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; +import static org.keycloak.tests.admin.model.workflow.WorkflowManagementTest.findEmailByRecipient; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; -import static org.keycloak.tests.admin.model.workflow.WorkflowManagementTest.findEmailByRecipient; @KeycloakIntegrationTest(config = WorkflowsBlockingServerConfig.class) public class UserResourceTypeSelectorTest extends AbstractWorkflowTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserSessionRefreshTimeWorkflowTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserSessionRefreshTimeWorkflowTest.java index 23328acee8b..b688374982d 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserSessionRefreshTimeWorkflowTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/UserSessionRefreshTimeWorkflowTest.java @@ -17,27 +17,17 @@ package org.keycloak.tests.admin.model.workflow; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; -import static org.keycloak.models.workflow.ResourceOperationType.USER_LOGGED_IN; -import static org.keycloak.tests.admin.model.workflow.WorkflowManagementTest.findEmailByRecipient; -import static org.keycloak.tests.admin.model.workflow.WorkflowManagementTest.findEmailsByRecipient; -import static org.keycloak.tests.admin.model.workflow.WorkflowManagementTest.verifyEmailContent; - import java.time.Duration; import java.util.List; import jakarta.mail.internet.MimeMessage; -import org.junit.jupiter.api.Test; + import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.workflow.DisableUserStepProviderFactory; import org.keycloak.models.workflow.NotifyUserStepProviderFactory; -import org.keycloak.representations.workflows.WorkflowStepRepresentation; import org.keycloak.representations.workflows.WorkflowRepresentation; +import org.keycloak.representations.workflows.WorkflowStepRepresentation; import org.keycloak.testframework.annotations.InjectUser; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.injection.LifeCycle; @@ -47,6 +37,19 @@ import org.keycloak.testframework.realm.ManagedUser; import org.keycloak.testframework.realm.UserConfig; import org.keycloak.testframework.realm.UserConfigBuilder; +import org.junit.jupiter.api.Test; + +import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; +import static org.keycloak.models.workflow.ResourceOperationType.USER_LOGGED_IN; +import static org.keycloak.tests.admin.model.workflow.WorkflowManagementTest.findEmailByRecipient; +import static org.keycloak.tests.admin.model.workflow.WorkflowManagementTest.findEmailsByRecipient; +import static org.keycloak.tests.admin.model.workflow.WorkflowManagementTest.verifyEmailContent; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + @KeycloakIntegrationTest(config = WorkflowsBlockingServerConfig.class) public class UserSessionRefreshTimeWorkflowTest extends AbstractWorkflowTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/WorkflowManagementTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/WorkflowManagementTest.java index 804a90cfed7..95b1b72a9fe 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/WorkflowManagementTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/model/workflow/WorkflowManagementTest.java @@ -17,40 +17,20 @@ package org.keycloak.tests.admin.model.workflow; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; - +import java.io.IOException; import java.time.Duration; import java.util.Arrays; import java.util.List; import java.util.UUID; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; -import com.fasterxml.jackson.jakarta.rs.yaml.JacksonYAMLProvider; -import com.fasterxml.jackson.jakarta.rs.yaml.YAMLMediaTypes; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.hamcrest.Matchers; -import jakarta.mail.MessagingException; -import jakarta.mail.internet.MimeMessage; -import java.io.IOException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.BearerAuthFilter; import org.keycloak.admin.client.resource.WorkflowsResource; @@ -61,30 +41,52 @@ import org.keycloak.models.UserModel; import org.keycloak.models.workflow.DeleteUserStepProviderFactory; import org.keycloak.models.workflow.DisableUserStepProviderFactory; import org.keycloak.models.workflow.NotifyUserStepProviderFactory; -import org.keycloak.models.workflow.RestartWorkflowStepProviderFactory; -import org.keycloak.models.workflow.WorkflowProvider; -import org.keycloak.models.workflow.WorkflowStep; import org.keycloak.models.workflow.ResourceOperationType; +import org.keycloak.models.workflow.RestartWorkflowStepProviderFactory; +import org.keycloak.models.workflow.SetUserAttributeStepProviderFactory; import org.keycloak.models.workflow.Workflow; +import org.keycloak.models.workflow.WorkflowProvider; import org.keycloak.models.workflow.WorkflowStateProvider; import org.keycloak.models.workflow.WorkflowStateProvider.ScheduledStep; -import org.keycloak.models.workflow.SetUserAttributeStepProviderFactory; +import org.keycloak.models.workflow.WorkflowStep; import org.keycloak.models.workflow.conditions.IdentityProviderWorkflowConditionFactory; import org.keycloak.representations.idm.ErrorRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; +import org.keycloak.representations.workflows.WorkflowRepresentation; import org.keycloak.representations.workflows.WorkflowSetRepresentation; import org.keycloak.representations.workflows.WorkflowStepRepresentation; -import org.keycloak.representations.workflows.WorkflowRepresentation; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.InjectKeycloakUrls; +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.mail.MailServer; import org.keycloak.testframework.mail.annotations.InjectMailServer; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.remote.providers.runonserver.RunOnServer; import org.keycloak.testframework.server.KeycloakUrls; import org.keycloak.tests.utils.MailUtils; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; +import com.fasterxml.jackson.jakarta.rs.yaml.JacksonYAMLProvider; +import com.fasterxml.jackson.jakarta.rs.yaml.YAMLMediaTypes; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.keycloak.models.workflow.ResourceOperationType.USER_ADDED; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + @KeycloakIntegrationTest(config = WorkflowsBlockingServerConfig.class) public class WorkflowManagementTest extends AbstractWorkflowTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/partialexport/PartialExportTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/partialexport/PartialExportTest.java index 54d5a4618be..2bcbdb8eb0b 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/partialexport/PartialExportTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/partialexport/PartialExportTest.java @@ -1,9 +1,16 @@ package org.keycloak.tests.admin.partialexport; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + import org.keycloak.admin.client.Keycloak; +import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.ClientSecretConstants; import org.keycloak.representations.idm.ClientRepresentation; @@ -14,23 +21,17 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.ScopeMappingRepresentation; +import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testframework.annotations.InjectAdminClient; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.tests.utils.Assert; - -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import org.hamcrest.Matchers; -import org.keycloak.common.constants.ServiceAccountConstants; -import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.util.JsonSerialization; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/AbstractPartialImportTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/AbstractPartialImportTest.java index 3f6e297ad9f..5953bc98a4b 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/AbstractPartialImportTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/AbstractPartialImportTest.java @@ -1,7 +1,14 @@ package org.keycloak.tests.admin.partialimport; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.BeforeEach; + import org.keycloak.common.constants.ServiceAccountConstants; import org.keycloak.models.UserModel; import org.keycloak.partialimport.PartialImportResults; @@ -30,12 +37,7 @@ import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import org.junit.jupiter.api.BeforeEach; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportClientTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportClientTest.java index 7e7425bd7ce..b9b9d5ccc9a 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportClientTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportClientTest.java @@ -1,7 +1,11 @@ package org.keycloak.tests.admin.partialimport; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.UserResource; @@ -18,11 +22,8 @@ import org.keycloak.representations.idm.authorization.ResourceServerRepresentati import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.tests.utils.Assert; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportGroupTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportGroupTest.java index 38aaa09dfb5..18fb5a6722f 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportGroupTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportGroupTest.java @@ -16,9 +16,10 @@ */ package org.keycloak.tests.admin.partialimport; -import org.junit.jupiter.api.Test; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.junit.jupiter.api.Test; + /** * Tests for the partial import endpoint in admin client. Also tests the * server side functionality of each resource along with "fail, skip, overwrite" diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportProvidersTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportProvidersTest.java index 1581eb62946..f0fe7a59e1b 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportProvidersTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportProvidersTest.java @@ -1,6 +1,8 @@ package org.keycloak.tests.admin.partialimport; -import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.Map; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.partialimport.PartialImportResult; import org.keycloak.partialimport.PartialImportResults; @@ -9,8 +11,7 @@ import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import java.util.Arrays; -import java.util.Map; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportRealmTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportRealmTest.java index 1a6c9e1dc0c..920a5dc5eae 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportRealmTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportRealmTest.java @@ -1,9 +1,10 @@ package org.keycloak.tests.admin.partialimport; -import org.junit.jupiter.api.Test; import org.keycloak.partialimport.PartialImportResults; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportRolesTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportRolesTest.java index b372d569ba4..9955b75af28 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportRolesTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportRolesTest.java @@ -1,7 +1,8 @@ package org.keycloak.tests.admin.partialimport; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.Collections; +import java.util.List; + import org.keycloak.admin.client.resource.RoleResource; import org.keycloak.partialimport.PartialImportResult; import org.keycloak.partialimport.PartialImportResults; @@ -9,8 +10,8 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.RolesRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import java.util.Collections; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportUserTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportUserTest.java index 32d8fe879c9..bdd742e9988 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportUserTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/partialimport/PartialImportUserTest.java @@ -1,8 +1,11 @@ package org.keycloak.tests.admin.partialimport; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.requiredactions.TermsAndConditions; import org.keycloak.events.admin.OperationType; @@ -14,9 +17,8 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.UserConfigBuilder; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.startsWith; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/AbstractRealmRolesTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/AbstractRealmRolesTest.java index d8f84b9f73f..862df4bfab5 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/AbstractRealmRolesTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/AbstractRealmRolesTest.java @@ -17,15 +17,15 @@ package org.keycloak.tests.admin.realm; +import java.util.List; +import java.util.Map; + import org.keycloak.testframework.annotations.InjectAdminEvents; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.realm.ManagedRealm; -import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testframework.realm.RealmConfig; - -import java.util.List; -import java.util.Map; +import org.keycloak.testframework.realm.RealmConfigBuilder; /** * @author Stian Thorgersen diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmAttributesTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmAttributesTest.java index 0ddb1292abc..5dcba84f6f3 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmAttributesTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmAttributesTest.java @@ -1,9 +1,15 @@ package org.keycloak.tests.admin.realm; -import com.google.common.collect.Sets; -import org.hamcrest.CoreMatchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.BrowserSecurityHeaders; @@ -20,15 +26,10 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import com.google.common.collect.Sets; +import org.hamcrest.CoreMatchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCacheTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCacheTest.java index 6aa1a53dafb..feb6cbe282b 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCacheTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCacheTest.java @@ -1,8 +1,7 @@ package org.keycloak.tests.admin.realm; import jakarta.ws.rs.core.Response; -import org.infinispan.Cache; -import org.junit.jupiter.api.Test; + import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -13,8 +12,11 @@ import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; +import org.keycloak.tests.utils.admin.ApiUtil; + +import org.infinispan.Cache; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCreateTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCreateTest.java index e832423d457..a254b6b13e7 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCreateTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmCreateTest.java @@ -1,10 +1,16 @@ package org.keycloak.tests.admin.realm; -import com.google.common.collect.ImmutableSet; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.AdminRoles; @@ -16,13 +22,9 @@ import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.tests.utils.Assert; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import com.google.common.collect.ImmutableSet; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmDefaultConfigTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmDefaultConfigTest.java index 1e28d759db2..415fffcc5ae 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmDefaultConfigTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmDefaultConfigTest.java @@ -17,9 +17,13 @@ package org.keycloak.tests.admin.realm; +import java.io.IOException; +import java.nio.charset.Charset; +import java.util.Collections; +import java.util.List; + import jakarta.ws.rs.NotFoundException; -import org.apache.commons.io.IOUtils; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -41,10 +45,8 @@ import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.runonserver.RunHelpers; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.Collections; -import java.util.List; +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmOAuthActionsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmOAuthActionsTest.java index 7205a371b29..1b74ccd42f8 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmOAuthActionsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmOAuthActionsTest.java @@ -1,9 +1,11 @@ package org.keycloak.tests.admin.realm; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.common.util.Time; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -28,12 +30,12 @@ import org.keycloak.testframework.oauth.annotations.InjectTestApp; import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.server.KeycloakUrls; -import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.tests.utils.admin.AdminEventPaths; +import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRemoveTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRemoveTest.java index f60786ed4d6..2fd98b8aeb1 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRemoveTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRemoveTest.java @@ -1,13 +1,15 @@ package org.keycloak.tests.admin.realm; import jakarta.ws.rs.BadRequestException; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.models.Constants; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.tests.utils.Assert; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.fail; @KeycloakIntegrationTest diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesCRUDTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesCRUDTest.java index a1d86977c69..ed3d52fbe95 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesCRUDTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesCRUDTest.java @@ -1,10 +1,16 @@ package org.keycloak.tests.admin.realm; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.NotFoundException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.RoleResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.events.admin.OperationType; @@ -20,12 +26,8 @@ import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.admin.AdminEventPaths; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesGroupTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesGroupTest.java index 79eaa2b543d..320c3834108 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesGroupTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesGroupTest.java @@ -1,14 +1,15 @@ package org.keycloak.tests.admin.realm; -import org.junit.jupiter.api.Test; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; + import org.keycloak.admin.client.resource.RoleResource; import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesSearchTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesSearchTest.java index 6666f9efa84..ce856a9b006 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesSearchTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesSearchTest.java @@ -1,6 +1,10 @@ package org.keycloak.tests.admin.realm; -import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.representations.idm.RoleRepresentation; @@ -8,10 +12,7 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.tests.utils.admin.AdminEventPaths; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesUserTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesUserTest.java index de7721232a1..d158363839c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesUserTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmRolesUserTest.java @@ -1,7 +1,11 @@ package org.keycloak.tests.admin.realm; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.admin.client.resource.RoleResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.representations.idm.RoleRepresentation; @@ -9,11 +13,8 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.UserConfigBuilder; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmUpdateTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmUpdateTest.java index df95a59c4ed..625d5d0c0f5 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmUpdateTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/realm/RealmUpdateTest.java @@ -1,8 +1,14 @@ package org.keycloak.tests.admin.realm; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import jakarta.ws.rs.BadRequestException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.events.EventType; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -15,12 +21,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.userprofile.UserProfileProvider; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/tracing/TracingTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/tracing/TracingTest.java index 9b4903c8bac..671297b1383 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/tracing/TracingTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/tracing/TracingTest.java @@ -1,6 +1,5 @@ package org.keycloak.tests.admin.tracing; -import org.junit.jupiter.api.Test; import org.keycloak.connections.httpclient.DefaultHttpClientFactory; import org.keycloak.connections.httpclient.HttpClientProvider; import org.keycloak.quarkus.runtime.tracing.OTelHttpClientFactory; @@ -10,6 +9,8 @@ import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; +import org.junit.jupiter.api.Test; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/AbstractUserTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/AbstractUserTest.java index 265c6150860..2c227ede1fc 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/AbstractUserTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/AbstractUserTest.java @@ -1,9 +1,20 @@ package org.keycloak.tests.admin.user; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.credential.CredentialModel; @@ -25,7 +36,6 @@ import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.realm.ManagedRealm; -import org.keycloak.tests.utils.runonserver.RunHelpers; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.testframework.ui.annotations.InjectPage; @@ -33,22 +43,14 @@ import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.LoginPage; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; +import org.keycloak.tests.utils.runonserver.RunHelpers; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.util.JsonSerialization; -import org.openqa.selenium.WebDriver; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.openqa.selenium.WebDriver; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserAttributesTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserAttributesTest.java index 01452a890f5..d0281630a13 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserAttributesTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserAttributesTest.java @@ -1,9 +1,14 @@ package org.keycloak.tests.admin.user; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import jakarta.ws.rs.BadRequestException; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.models.LDAPConstants; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.ErrorRepresentation; @@ -13,12 +18,9 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCreateTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCreateTest.java index 5053b2c9046..9ef2866bdde 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCreateTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCreateTest.java @@ -1,10 +1,14 @@ package org.keycloak.tests.admin.user; +import java.io.IOException; +import java.util.Arrays; +import java.util.Base64; +import java.util.Collections; +import java.util.List; + import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; -import org.hamcrest.MatcherAssert; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.CreatedResponseUtil; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.UserResource; @@ -33,6 +37,7 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.realm.ManagedRealm; +import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; @@ -40,18 +45,15 @@ import org.keycloak.tests.utils.Assert; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; -import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.Arrays; -import java.util.Base64; -import java.util.Collections; -import java.util.List; +import org.hamcrest.MatcherAssert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.Matchers.endsWith; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCredentialTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCredentialTest.java index a8d50bc4289..ede3b614539 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCredentialTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserCredentialTest.java @@ -1,11 +1,16 @@ package org.keycloak.tests.admin.user; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.util.ObjectUtil; import org.keycloak.events.admin.OperationType; @@ -26,11 +31,8 @@ import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Optional; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserDeleteTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserDeleteTest.java index ca91e8401db..d517201ef58 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserDeleteTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserDeleteTest.java @@ -1,13 +1,15 @@ package org.keycloak.tests.admin.user; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.tests.utils.admin.ApiUtil; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; @KeycloakIntegrationTest diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserEmailTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserEmailTest.java index 40d70784902..d0deecb46e4 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserEmailTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserEmailTest.java @@ -1,11 +1,20 @@ package org.keycloak.tests.admin.user; +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.Response; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.TokenVerifier; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; @@ -41,21 +50,14 @@ import org.keycloak.testframework.ui.page.ErrorPage; import org.keycloak.testframework.ui.page.InfoPage; import org.keycloak.testframework.ui.page.LoginPasswordUpdatePage; import org.keycloak.testframework.ui.page.ProceedPage; +import org.keycloak.tests.utils.MailUtils; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; -import org.keycloak.tests.utils.MailUtils; -import org.openqa.selenium.By; -import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.openqa.selenium.By; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserFedarationTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserFedarationTest.java index 122e998e9d7..cd386c2ea3c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserFedarationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserFedarationTest.java @@ -1,7 +1,9 @@ package org.keycloak.tests.admin.user; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.util.MultivaluedHashMap; @@ -25,12 +27,12 @@ import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.federation.UserMapStorageFactory; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; @KeycloakIntegrationTest(config = UserFedarationTest.UserFederationServerConfig.class) public class UserFedarationTest extends AbstractUserTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserGroupTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserGroupTest.java index 803224d87ae..ecad1b111a6 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserGroupTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserGroupTest.java @@ -1,7 +1,14 @@ package org.keycloak.tests.admin.user; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -14,19 +21,15 @@ import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; +import org.junit.jupiter.api.Test; + +import static org.keycloak.tests.utils.Assert.assertNames; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.tests.utils.Assert.assertNames; @KeycloakIntegrationTest public class UserGroupTest extends AbstractUserTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserProfileTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserProfileTest.java index 7c48a23a39e..ae5589a9ce7 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserProfileTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserProfileTest.java @@ -17,8 +17,9 @@ package org.keycloak.tests.admin.user; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Test; +import java.util.List; +import java.util.Set; + import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.models.UserModel; @@ -34,8 +35,8 @@ import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.realm.UserConfigBuilder; -import java.util.List; -import java.util.Set; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRequiredActionsTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRequiredActionsTest.java index 9876d94781a..8cb3f6c1b49 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRequiredActionsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRequiredActionsTest.java @@ -1,7 +1,5 @@ package org.keycloak.tests.admin.user; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -12,6 +10,9 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.tests.utils.admin.AdminEventPaths; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRoleTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRoleTest.java index 8bacea1e80b..c5c31164bfc 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRoleTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserRoleTest.java @@ -1,7 +1,11 @@ package org.keycloak.tests.admin.user; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.RoleMappingResource; import org.keycloak.events.admin.OperationType; @@ -17,19 +21,18 @@ import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.GroupConfigBuilder; import org.keycloak.testframework.realm.ManagedRealm; +import org.keycloak.testframework.realm.RoleConfigBuilder; import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; -import org.keycloak.testframework.realm.RoleConfigBuilder; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; +import org.junit.jupiter.api.Test; + +import static org.keycloak.tests.utils.Assert.assertNames; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.keycloak.tests.utils.Assert.assertNames; @KeycloakIntegrationTest public class UserRoleTest extends AbstractUserTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserSearchTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserSearchTest.java index 948f86f844e..9a09f6f0695 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserSearchTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserSearchTest.java @@ -1,9 +1,15 @@ package org.keycloak.tests.admin.user; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.Response; -import org.apache.commons.lang3.RandomStringUtils; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.ClientRepresentation; @@ -17,13 +23,9 @@ import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.userprofile.DefaultAttributes; import org.keycloak.userprofile.validator.UsernameProhibitedCharactersValidator; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.stream.Collectors; +import org.apache.commons.lang3.RandomStringUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserUpdateTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserUpdateTest.java index be2fb16a4f4..704ccd9b0d2 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/user/UserUpdateTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/user/UserUpdateTest.java @@ -1,10 +1,12 @@ package org.keycloak.tests.admin.user; +import java.util.Arrays; +import java.util.Collections; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.NotFoundException; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.crypto.hash.Argon2Parameters; import org.keycloak.crypto.hash.Argon2PasswordHashProviderFactory; @@ -28,17 +30,17 @@ import org.keycloak.tests.utils.admin.AdminEventPaths; import org.keycloak.tests.utils.admin.ApiUtil; import org.keycloak.testsuite.util.AccountHelper; -import java.util.Arrays; -import java.util.Collections; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.fail; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; @KeycloakIntegrationTest public class UserUpdateTest extends AbstractUserTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/userprofile/UserProfileAdminTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/userprofile/UserProfileAdminTest.java index dfe07372366..f6807e786f8 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/userprofile/UserProfileAdminTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/userprofile/UserProfileAdminTest.java @@ -1,7 +1,8 @@ package org.keycloak.tests.admin.userprofile; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.UserProfileAttributeGroupMetadata; @@ -16,8 +17,8 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.tests.utils.JsonTestUtils; import org.keycloak.userprofile.config.UPConfigUtils; -import java.util.List; -import java.util.Map; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest public class UserProfileAdminTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/AbstractUserStorageRestTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/AbstractUserStorageRestTest.java index 767c12cea00..191c32994ed 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/AbstractUserStorageRestTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/AbstractUserStorageRestTest.java @@ -1,7 +1,7 @@ package org.keycloak.tests.admin.userstorage; import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.LDAPConstants; import org.keycloak.representations.idm.ComponentRepresentation; @@ -12,6 +12,8 @@ import org.keycloak.testframework.events.AdminEvents; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.tests.utils.admin.ApiUtil; +import org.junit.jupiter.api.Assertions; + public class AbstractUserStorageRestTest { @InjectRealm diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/UserStorageKerberosRestTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/UserStorageKerberosRestTest.java index 0aafbf07b71..8553b9483c8 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/UserStorageKerberosRestTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/UserStorageKerberosRestTest.java @@ -1,7 +1,7 @@ package org.keycloak.tests.admin.userstorage; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.List; + import org.keycloak.common.constants.KerberosConstants; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.events.admin.OperationType; @@ -14,7 +14,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.events.AdminEventAssertion; import org.keycloak.tests.utils.admin.AdminEventPaths; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest public class UserStorageKerberosRestTest extends AbstractUserStorageRestTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/UserStorageRestTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/UserStorageRestTest.java index c2be410a82d..6eb0a1bb4b7 100644 --- a/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/UserStorageRestTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/admin/userstorage/UserStorageRestTest.java @@ -17,8 +17,11 @@ package org.keycloak.tests.admin.userstorage; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.List; + +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ComponentResource; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.LDAPConstants; @@ -35,10 +38,8 @@ import org.keycloak.storage.ldap.mappers.membership.role.RoleMapperConfig; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.tests.utils.Assert; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.core.Response; - -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Marek Posolda diff --git a/tests/base/src/test/java/org/keycloak/tests/client/OIDCClientRegistrationCorsTest.java b/tests/base/src/test/java/org/keycloak/tests/client/OIDCClientRegistrationCorsTest.java index 433168ee0e3..5c59a24747e 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/OIDCClientRegistrationCorsTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/OIDCClientRegistrationCorsTest.java @@ -1,7 +1,13 @@ package org.keycloak.tests.client; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.CreatedResponseUtil; import org.keycloak.http.simple.SimpleHttp; import org.keycloak.http.simple.SimpleHttpRequest; @@ -23,13 +29,8 @@ import org.keycloak.testframework.oauth.annotations.InjectOAuthClient; import org.keycloak.testframework.realm.ClientConfigBuilder; import org.keycloak.testframework.realm.ManagedRealm; -import jakarta.ws.rs.core.Response; - -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest public class OIDCClientRegistrationCorsTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/AbstractBaseClientAuthTest.java b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/AbstractBaseClientAuthTest.java index 80efb412fa0..6681fc28d8c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/AbstractBaseClientAuthTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/AbstractBaseClientAuthTest.java @@ -1,12 +1,13 @@ package org.keycloak.tests.client.authentication.external; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.common.util.Time; import org.keycloak.representations.JsonWebToken; import org.keycloak.testframework.oauth.OAuthIdentityProvider; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + public abstract class AbstractBaseClientAuthTest extends AbstractClientAuthTest { public AbstractBaseClientAuthTest(String expectedTokenIssuer, String internalClientId, String externalClientId) { diff --git a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/AbstractClientAuthTest.java b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/AbstractClientAuthTest.java index 8099d0f8c14..6a9c2e2e295 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/AbstractClientAuthTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/AbstractClientAuthTest.java @@ -1,6 +1,5 @@ package org.keycloak.tests.client.authentication.external; -import org.junit.jupiter.api.Assertions; import org.keycloak.OAuth2Constants; import org.keycloak.events.EventType; import org.keycloak.representations.AccessToken; @@ -14,6 +13,8 @@ import org.keycloak.testframework.oauth.OAuthIdentityProvider; import org.keycloak.testframework.oauth.annotations.InjectOAuthClient; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.junit.jupiter.api.Assertions; + public abstract class AbstractClientAuthTest { final String expectedTokenIssuer; diff --git a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/BaseClientAuthTest.java b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/BaseClientAuthTest.java index 1252115dc52..d50f46081a9 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/BaseClientAuthTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/BaseClientAuthTest.java @@ -1,7 +1,7 @@ package org.keycloak.tests.client.authentication.external; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.UUID; + import org.keycloak.authentication.authenticators.client.FederatedJWTClientAuthenticator; import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; @@ -16,7 +16,8 @@ import org.keycloak.testframework.realm.RealmConfig; import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testsuite.util.IdentityProviderBuilder; -import java.util.UUID; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest(config = ClientAuthIdpServerConfig.class) public class BaseClientAuthTest extends AbstractBaseClientAuthTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/FederatedClientAuthFromKeycloakTest.java b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/FederatedClientAuthFromKeycloakTest.java index 63ca309620d..5be8df7803b 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/FederatedClientAuthFromKeycloakTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/FederatedClientAuthFromKeycloakTest.java @@ -1,7 +1,7 @@ package org.keycloak.tests.client.authentication.external; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.List; + import org.keycloak.authentication.authenticators.client.FederatedJWTClientAuthenticator; import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; @@ -18,7 +18,8 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testsuite.util.IdentityProviderBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest(config = ClientAuthIdpServerConfig.class) public class FederatedClientAuthFromKeycloakTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/FederatedClientAuthMappingTest.java b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/FederatedClientAuthMappingTest.java index e7af81957f9..031fab5f5b9 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/FederatedClientAuthMappingTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/FederatedClientAuthMappingTest.java @@ -1,7 +1,7 @@ package org.keycloak.tests.client.authentication.external; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.UUID; + import org.keycloak.authentication.authenticators.client.FederatedJWTClientAuthenticator; import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; @@ -21,7 +21,8 @@ import org.keycloak.testframework.realm.RealmConfigBuilder; import org.keycloak.testsuite.util.IdentityProviderBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.UUID; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest(config = ClientAuthIdpServerConfig.class) public class FederatedClientAuthMappingTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/KubernetesClientAuthTest.java b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/KubernetesClientAuthTest.java index 89e2c462096..1719365e9b7 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/KubernetesClientAuthTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/KubernetesClientAuthTest.java @@ -1,9 +1,7 @@ package org.keycloak.tests.client.authentication.external; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; +import java.util.UUID; + import org.keycloak.authentication.authenticators.client.FederatedJWTClientAuthenticator; import org.keycloak.broker.kubernetes.KubernetesIdentityProviderConfig; import org.keycloak.broker.kubernetes.KubernetesIdentityProviderFactory; @@ -23,7 +21,10 @@ import org.keycloak.testframework.remote.timeoffset.TimeOffSet; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.testsuite.util.IdentityProviderBuilder; -import java.util.UUID; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; @KeycloakIntegrationTest(config = KubernetesClientAuthTest.KubernetesServerConfig.class) @TestMethodOrder(MethodOrderer.MethodName.class) diff --git a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthTest.java b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthTest.java index 40c6ca4ba15..c09de8b5883 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthTest.java @@ -1,9 +1,5 @@ package org.keycloak.tests.client.authentication.external; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.authentication.authenticators.client.FederatedJWTClientAuthenticator; import org.keycloak.broker.spiffe.SpiffeConstants; import org.keycloak.broker.spiffe.SpiffeIdentityProviderConfig; @@ -26,6 +22,11 @@ import org.keycloak.testframework.remote.timeoffset.TimeOffSet; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.testsuite.util.IdentityProviderBuilder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; + @KeycloakIntegrationTest(config = SpiffeClientAuthTest.SpiffeServerConfig.class) @TestMethodOrder(MethodOrderer.MethodName.class) public class SpiffeClientAuthTest extends AbstractBaseClientAuthTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthWithJwkUseSigTest.java b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthWithJwkUseSigTest.java index 49b6f9007eb..fab957c8ee0 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthWithJwkUseSigTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthWithJwkUseSigTest.java @@ -1,8 +1,5 @@ package org.keycloak.tests.client.authentication.external; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.broker.spiffe.SpiffeConstants; import org.keycloak.common.util.Time; import org.keycloak.representations.JsonWebToken; @@ -14,6 +11,10 @@ import org.keycloak.testframework.oauth.OAuthIdentityProviderConfigBuilder; import org.keycloak.testframework.oauth.annotations.InjectOAuthIdentityProvider; import org.keycloak.testframework.realm.ManagedRealm; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; + @KeycloakIntegrationTest(config = SpiffeClientAuthTest.SpiffeServerConfig.class) @TestMethodOrder(MethodOrderer.MethodName.class) public class SpiffeClientAuthWithJwkUseSigTest extends AbstractClientAuthTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthWithOIDCPluginTest.java b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthWithOIDCPluginTest.java index 889c1222d1e..4782654893d 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthWithOIDCPluginTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeClientAuthWithOIDCPluginTest.java @@ -1,8 +1,5 @@ package org.keycloak.tests.client.authentication.external; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.broker.spiffe.SpiffeConstants; import org.keycloak.common.util.Time; import org.keycloak.representations.JsonWebToken; @@ -14,6 +11,10 @@ import org.keycloak.testframework.oauth.OAuthIdentityProviderConfigBuilder; import org.keycloak.testframework.oauth.annotations.InjectOAuthIdentityProvider; import org.keycloak.testframework.realm.ManagedRealm; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; + @KeycloakIntegrationTest(config = SpiffeClientAuthTest.SpiffeServerConfig.class) @TestMethodOrder(MethodOrderer.MethodName.class) public class SpiffeClientAuthWithOIDCPluginTest extends AbstractClientAuthTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeConfigTest.java b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeConfigTest.java index 7aa3349a3ce..f6ca3dca899 100644 --- a/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeConfigTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/client/authentication/external/SpiffeConfigTest.java @@ -1,14 +1,10 @@ package org.keycloak.tests.client.authentication.external; -import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; +import java.util.Map; + import jakarta.ws.rs.core.Response; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.admin.client.resource.IdentityProvidersResource; import org.keycloak.broker.spiffe.SpiffeIdentityProviderConfig; import org.keycloak.broker.spiffe.SpiffeIdentityProviderFactory; @@ -29,10 +25,15 @@ import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.page.LoginPage; import org.keycloak.tests.common.BasicUserConfig; import org.keycloak.testsuite.util.IdentityProviderBuilder; -import org.openqa.selenium.NoSuchElementException; -import java.io.IOException; -import java.util.Map; +import com.fasterxml.jackson.databind.JsonNode; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.openqa.selenium.NoSuchElementException; @KeycloakIntegrationTest(config = SpiffeClientAuthTest.SpiffeServerConfig.class) @TestMethodOrder(MethodOrderer.MethodName.class) diff --git a/tests/base/src/test/java/org/keycloak/tests/cors/CustomCorsAllowedHeadersTest.java b/tests/base/src/test/java/org/keycloak/tests/cors/CustomCorsAllowedHeadersTest.java index ef5a525420d..fb623161904 100644 --- a/tests/base/src/test/java/org/keycloak/tests/cors/CustomCorsAllowedHeadersTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/cors/CustomCorsAllowedHeadersTest.java @@ -1,9 +1,9 @@ package org.keycloak.tests.cors; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; + import org.keycloak.http.simple.SimpleHttp; import org.keycloak.http.simple.SimpleHttpResponse; import org.keycloak.services.cors.Cors; @@ -14,9 +14,10 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest(config = CustomCorsAllowedHeadersTest.CustomCorsAllowedHeadersServerConfig.class) public class CustomCorsAllowedHeadersTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/db/AbstractDBSchemaTest.java b/tests/base/src/test/java/org/keycloak/tests/db/AbstractDBSchemaTest.java index 3ac13c27067..ecd203d1413 100644 --- a/tests/base/src/test/java/org/keycloak/tests/db/AbstractDBSchemaTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/db/AbstractDBSchemaTest.java @@ -1,6 +1,5 @@ package org.keycloak.tests.db; -import org.junit.jupiter.api.Test; import org.keycloak.admin.client.resource.RolesResource; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.testframework.annotations.InjectClient; @@ -10,6 +9,8 @@ import org.keycloak.testframework.injection.Extensions; import org.keycloak.testframework.realm.ManagedClient; import org.keycloak.testframework.realm.RoleConfigBuilder; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public abstract class AbstractDBSchemaTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/db/DbTest.java b/tests/base/src/test/java/org/keycloak/tests/db/DbTest.java index 0df0abffed0..cc83c901e79 100644 --- a/tests/base/src/test/java/org/keycloak/tests/db/DbTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/db/DbTest.java @@ -1,13 +1,14 @@ package org.keycloak.tests.db; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.config.DatabaseOptions; import org.keycloak.quarkus.runtime.configuration.Configuration; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; import org.keycloak.testframework.remote.runonserver.RunOnServerClient; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest public class DbTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/db/PreserveSchemaCaseLiquibaseTest.java b/tests/base/src/test/java/org/keycloak/tests/db/PreserveSchemaCaseLiquibaseTest.java index 3461b364c41..93f8c299509 100644 --- a/tests/base/src/test/java/org/keycloak/tests/db/PreserveSchemaCaseLiquibaseTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/db/PreserveSchemaCaseLiquibaseTest.java @@ -2,8 +2,8 @@ package org.keycloak.tests.db; import org.keycloak.testframework.annotations.InjectTestDatabase; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import org.keycloak.testframework.database.DatabaseConfig; import org.keycloak.testframework.conditions.DisabledForDatabases; +import org.keycloak.testframework.database.DatabaseConfig; import org.keycloak.testframework.database.DatabaseConfigBuilder; import org.keycloak.testframework.database.EnterpriseDbTestDatabase; import org.keycloak.testframework.database.PostgresTestDatabase; diff --git a/tests/base/src/test/java/org/keycloak/tests/forms/AuthzEndpointRequestParserCustomConfigTest.java b/tests/base/src/test/java/org/keycloak/tests/forms/AuthzEndpointRequestParserCustomConfigTest.java index 9ee71a159e4..4a0af0b78e0 100644 --- a/tests/base/src/test/java/org/keycloak/tests/forms/AuthzEndpointRequestParserCustomConfigTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/forms/AuthzEndpointRequestParserCustomConfigTest.java @@ -1,6 +1,5 @@ package org.keycloak.tests.forms; -import org.junit.jupiter.api.Test; import org.keycloak.common.util.SecretGenerator; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory; @@ -8,6 +7,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; +import org.junit.jupiter.api.Test; + /** * Custom configuration of OIDC login protocol factory with some overriden config values * diff --git a/tests/base/src/test/java/org/keycloak/tests/forms/AuthzEndpointRequestParserTest.java b/tests/base/src/test/java/org/keycloak/tests/forms/AuthzEndpointRequestParserTest.java index 0a80de2b4ee..c54e1142cad 100644 --- a/tests/base/src/test/java/org/keycloak/tests/forms/AuthzEndpointRequestParserTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/forms/AuthzEndpointRequestParserTest.java @@ -1,9 +1,5 @@ package org.keycloak.tests.forms; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.common.util.SecretGenerator; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.InjectUser; @@ -18,6 +14,11 @@ import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.LoginPage; import org.keycloak.testsuite.util.AccountHelper; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.openqa.selenium.WebDriver; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/tests/base/src/test/java/org/keycloak/tests/infinispan/InfinispanXMLBackwardCompatibilityTest.java b/tests/base/src/test/java/org/keycloak/tests/infinispan/InfinispanXMLBackwardCompatibilityTest.java index 2ad970d9ca4..f7d0af18aa5 100644 --- a/tests/base/src/test/java/org/keycloak/tests/infinispan/InfinispanXMLBackwardCompatibilityTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/infinispan/InfinispanXMLBackwardCompatibilityTest.java @@ -1,7 +1,5 @@ package org.keycloak.tests.infinispan; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testframework.annotations.InjectRealm; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; @@ -9,6 +7,9 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.server.KeycloakServerConfig; import org.keycloak.testframework.server.KeycloakServerConfigBuilder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest(config = InfinispanXMLBackwardCompatibilityTest.ServerConfigWithCustomInfinispanXML.class) public class InfinispanXMLBackwardCompatibilityTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/keys/FallbackKeyProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/keys/FallbackKeyProviderTest.java index e6ce04d90a3..34d917477eb 100644 --- a/tests/base/src/test/java/org/keycloak/tests/keys/FallbackKeyProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/keys/FallbackKeyProviderTest.java @@ -17,8 +17,9 @@ package org.keycloak.tests.keys; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.crypto.Algorithm; import org.keycloak.models.Constants; import org.keycloak.representations.idm.ComponentRepresentation; @@ -34,8 +35,8 @@ import org.keycloak.tests.utils.Assert; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.LinkedList; -import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -113,4 +114,3 @@ public class FallbackKeyProviderTest { } } - diff --git a/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedEcdhKeyProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedEcdhKeyProviderTest.java index 133258dabc7..c9dff626e1e 100644 --- a/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedEcdhKeyProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedEcdhKeyProviderTest.java @@ -16,8 +16,13 @@ */ package org.keycloak.tests.keys; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.security.KeyFactory; +import java.security.interfaces.ECPublicKey; +import java.security.spec.X509EncodedKeySpec; +import java.util.Base64; + +import jakarta.ws.rs.core.Response; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyType; @@ -35,12 +40,8 @@ import org.keycloak.testframework.oauth.annotations.InjectOAuthClient; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.util.ApiUtil; -import jakarta.ws.rs.core.Response; - -import java.security.KeyFactory; -import java.security.interfaces.ECPublicKey; -import java.security.spec.X509EncodedKeySpec; -import java.util.Base64; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedEcdsaKeyProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedEcdsaKeyProviderTest.java index 4768b61f55b..5b212350e03 100644 --- a/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedEcdsaKeyProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedEcdsaKeyProviderTest.java @@ -16,8 +16,14 @@ */ package org.keycloak.tests.keys; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.security.KeyFactory; +import java.security.cert.X509Certificate; +import java.security.interfaces.ECPublicKey; +import java.security.spec.X509EncodedKeySpec; +import java.util.Base64; + +import jakarta.ws.rs.core.Response; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.PemUtils; import org.keycloak.crypto.KeyType; @@ -32,13 +38,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.util.ApiUtil; -import jakarta.ws.rs.core.Response; - -import java.security.KeyFactory; -import java.security.cert.X509Certificate; -import java.security.interfaces.ECPublicKey; -import java.security.spec.X509EncodedKeySpec; -import java.util.Base64; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedHmacKeyProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedHmacKeyProviderTest.java index 817d6989cdc..e62735cfd61 100644 --- a/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedHmacKeyProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedHmacKeyProviderTest.java @@ -17,7 +17,8 @@ package org.keycloak.tests.keys; -import org.junit.jupiter.api.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.crypto.Algorithm; @@ -35,7 +36,7 @@ import org.keycloak.testframework.remote.runonserver.RunOnServerClient; import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.runonserver.RunHelpers; -import jakarta.ws.rs.core.Response; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -185,4 +186,3 @@ public class GeneratedHmacKeyProviderTest { } } - diff --git a/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedRsaKeyProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedRsaKeyProviderTest.java index d24d5d4b158..77d8e3784ca 100644 --- a/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedRsaKeyProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/keys/GeneratedRsaKeyProviderTest.java @@ -17,7 +17,11 @@ package org.keycloak.tests.keys; -import org.junit.jupiter.api.Test; +import java.security.interfaces.RSAPublicKey; +import java.util.Arrays; + +import jakarta.ws.rs.core.Response; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.PemUtils; import org.keycloak.crypto.KeyUse; @@ -36,10 +40,7 @@ import org.keycloak.testframework.realm.ManagedRealm; import org.keycloak.testframework.util.ApiUtil; import org.keycloak.utils.StringUtil; -import jakarta.ws.rs.core.Response; - -import java.security.interfaces.RSAPublicKey; -import java.util.Arrays; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -253,4 +254,3 @@ public class GeneratedRsaKeyProviderTest { } } - diff --git a/tests/base/src/test/java/org/keycloak/tests/keys/ImportedRsaKeyProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/keys/ImportedRsaKeyProviderTest.java index 0ffd6708d59..e73bdf85220 100644 --- a/tests/base/src/test/java/org/keycloak/tests/keys/ImportedRsaKeyProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/keys/ImportedRsaKeyProviderTest.java @@ -17,7 +17,15 @@ package org.keycloak.tests.keys; -import org.junit.jupiter.api.Test; +import java.math.BigInteger; +import java.security.KeyPair; +import java.security.cert.Certificate; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.Date; + +import jakarta.ws.rs.core.Response; + import org.keycloak.common.util.CertificateUtils; import org.keycloak.common.util.KeyUtils; import org.keycloak.common.util.MultivaluedHashMap; @@ -43,14 +51,7 @@ import org.keycloak.testframework.remote.timeoffset.TimeOffSet; import org.keycloak.testframework.util.ApiUtil; import org.keycloak.testsuite.util.saml.SamlConstants; -import jakarta.ws.rs.core.Response; - -import java.math.BigInteger; -import java.security.KeyPair; -import java.security.cert.Certificate; -import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.Date; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -338,4 +339,3 @@ public class ImportedRsaKeyProviderTest { return rep; } } - diff --git a/tests/base/src/test/java/org/keycloak/tests/keys/JavaKeystoreKeyProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/keys/JavaKeystoreKeyProviderTest.java index 8c6acb8d823..4385cc161c5 100644 --- a/tests/base/src/test/java/org/keycloak/tests/keys/JavaKeystoreKeyProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/keys/JavaKeystoreKeyProviderTest.java @@ -17,12 +17,22 @@ package org.keycloak.tests.keys; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.logging.Logger; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; +import java.io.File; +import java.math.BigInteger; +import java.net.URISyntaxException; +import java.net.URL; +import java.nio.file.Path; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.cert.Certificate; +import java.security.cert.X509Certificate; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.Date; + +import jakarta.ws.rs.core.Response; + import org.keycloak.common.util.CertificateUtils; import org.keycloak.common.util.KeystoreUtil; import org.keycloak.common.util.MultivaluedHashMap; @@ -51,21 +61,12 @@ import org.keycloak.testframework.util.ApiUtil; import org.keycloak.tests.utils.KeyUtils; import org.keycloak.testsuite.util.saml.SamlConstants; -import jakarta.ws.rs.core.Response; - -import java.io.File; -import java.math.BigInteger; -import java.net.URISyntaxException; -import java.net.URL; -import java.nio.file.Path; -import java.security.KeyPair; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.cert.Certificate; -import java.security.cert.X509Certificate; -import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.Date; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.logging.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; @@ -407,4 +408,3 @@ public class JavaKeystoreKeyProviderTest { } } - diff --git a/tests/base/src/test/java/org/keycloak/tests/keys/KeyRotationTest.java b/tests/base/src/test/java/org/keycloak/tests/keys/KeyRotationTest.java index 9aeb57b1604..523319116aa 100644 --- a/tests/base/src/test/java/org/keycloak/tests/keys/KeyRotationTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/keys/KeyRotationTest.java @@ -17,8 +17,13 @@ package org.keycloak.tests.keys; -import com.fasterxml.jackson.databind.JsonNode; -import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.security.KeyPair; +import java.security.PublicKey; +import java.util.Map; + +import jakarta.ws.rs.core.Response; + import org.keycloak.client.registration.Auth; import org.keycloak.client.registration.ClientRegistration; import org.keycloak.client.registration.ClientRegistrationException; @@ -51,12 +56,8 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.UserInfoResponse; -import jakarta.ws.rs.core.Response; - -import java.io.IOException; -import java.security.KeyPair; -import java.security.PublicKey; -import java.util.Map; +import com.fasterxml.jackson.databind.JsonNode; +import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -338,4 +339,3 @@ public class KeyRotationTest { } } - diff --git a/tests/base/src/test/java/org/keycloak/tests/oauth/JWTAuthorizationGrantTest.java b/tests/base/src/test/java/org/keycloak/tests/oauth/JWTAuthorizationGrantTest.java index 4f07ec36e9c..0452247368c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/oauth/JWTAuthorizationGrantTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/oauth/JWTAuthorizationGrantTest.java @@ -1,9 +1,8 @@ package org.keycloak.tests.oauth; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; +import java.util.List; +import java.util.UUID; + import org.keycloak.OAuth2Constants; import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; @@ -42,8 +41,10 @@ import org.keycloak.tests.client.authentication.external.ClientAuthIdpServerConf import org.keycloak.testsuite.util.IdentityProviderBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.List; -import java.util.UUID; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; @KeycloakIntegrationTest(config = JWTAuthorizationGrantTest.JWTAuthorizationGrantServerConfig.class) public class JWTAuthorizationGrantTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/ClusterlessTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/ClusterlessTestSuite.java index 3e132733c4a..dad5838d8ca 100644 --- a/tests/base/src/test/java/org/keycloak/tests/suites/ClusterlessTestSuite.java +++ b/tests/base/src/test/java/org/keycloak/tests/suites/ClusterlessTestSuite.java @@ -1,9 +1,5 @@ package org.keycloak.tests.suites; -import org.junit.platform.suite.api.AfterSuite; -import org.junit.platform.suite.api.BeforeSuite; -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; import org.keycloak.common.Profile; import org.keycloak.testframework.injection.SuiteSupport; import org.keycloak.testframework.server.KeycloakServerConfig; @@ -11,6 +7,11 @@ import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.tests.admin.client.SessionTest; import org.keycloak.tests.admin.concurrency.ConcurrentLoginTest; +import org.junit.platform.suite.api.AfterSuite; +import org.junit.platform.suite.api.BeforeSuite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + @Suite @SelectClasses({SessionTest.class, ConcurrentLoginTest.class}) public class ClusterlessTestSuite { diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/DatabaseTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/DatabaseTestSuite.java index 987040efbb7..2295076013a 100644 --- a/tests/base/src/test/java/org/keycloak/tests/suites/DatabaseTestSuite.java +++ b/tests/base/src/test/java/org/keycloak/tests/suites/DatabaseTestSuite.java @@ -1,9 +1,10 @@ package org.keycloak.tests.suites; +import org.keycloak.tests.keys.GeneratedRsaKeyProviderTest; + import org.junit.platform.suite.api.SelectClasses; import org.junit.platform.suite.api.SelectPackages; import org.junit.platform.suite.api.Suite; -import org.keycloak.tests.keys.GeneratedRsaKeyProviderTest; @Suite @SelectPackages({ diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/FipsNonStrictTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/FipsNonStrictTestSuite.java index c2ff9c21aa5..97793ec59b6 100644 --- a/tests/base/src/test/java/org/keycloak/tests/suites/FipsNonStrictTestSuite.java +++ b/tests/base/src/test/java/org/keycloak/tests/suites/FipsNonStrictTestSuite.java @@ -1,9 +1,5 @@ package org.keycloak.tests.suites; -import org.junit.platform.suite.api.AfterSuite; -import org.junit.platform.suite.api.BeforeSuite; -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; import org.keycloak.common.Profile; import org.keycloak.common.crypto.FipsMode; import org.keycloak.common.util.KeystoreUtil; @@ -16,6 +12,11 @@ import org.keycloak.tests.admin.ServerInfoTest; import org.keycloak.tests.admin.client.CredentialsTest; import org.keycloak.tests.keys.JavaKeystoreKeyProviderTest; +import org.junit.platform.suite.api.AfterSuite; +import org.junit.platform.suite.api.BeforeSuite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + @Suite @SelectClasses({ CredentialsTest.class, diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/FipsStrictTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/FipsStrictTestSuite.java index 5617c4b9554..d43c98e878b 100644 --- a/tests/base/src/test/java/org/keycloak/tests/suites/FipsStrictTestSuite.java +++ b/tests/base/src/test/java/org/keycloak/tests/suites/FipsStrictTestSuite.java @@ -1,9 +1,5 @@ package org.keycloak.tests.suites; -import org.junit.platform.suite.api.AfterSuite; -import org.junit.platform.suite.api.BeforeSuite; -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; import org.keycloak.common.Profile; import org.keycloak.common.crypto.FipsMode; import org.keycloak.common.util.KeystoreUtil; @@ -16,6 +12,11 @@ import org.keycloak.tests.admin.ServerInfoTest; import org.keycloak.tests.admin.client.CredentialsTest; import org.keycloak.tests.keys.JavaKeystoreKeyProviderTest; +import org.junit.platform.suite.api.AfterSuite; +import org.junit.platform.suite.api.BeforeSuite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + @Suite @SelectClasses({ CredentialsTest.class, diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/FormsTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/FormsTestSuite.java index f5477aa3217..1befad045a8 100644 --- a/tests/base/src/test/java/org/keycloak/tests/suites/FormsTestSuite.java +++ b/tests/base/src/test/java/org/keycloak/tests/suites/FormsTestSuite.java @@ -1,8 +1,9 @@ package org.keycloak.tests.suites; +import org.keycloak.tests.admin.AdminHeadersTest; + import org.junit.platform.suite.api.SelectClasses; import org.junit.platform.suite.api.Suite; -import org.keycloak.tests.admin.AdminHeadersTest; @Suite // TODO: Select relevant test classes or packages once they have been migrated diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/JDKTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/JDKTestSuite.java index 21021fa09ec..6f2463c892b 100644 --- a/tests/base/src/test/java/org/keycloak/tests/suites/JDKTestSuite.java +++ b/tests/base/src/test/java/org/keycloak/tests/suites/JDKTestSuite.java @@ -1,11 +1,12 @@ package org.keycloak.tests.suites; -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; import org.keycloak.tests.admin.client.CredentialsTest; import org.keycloak.tests.keys.GeneratedRsaKeyProviderTest; import org.keycloak.tests.keys.JavaKeystoreKeyProviderTest; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + @Suite @SelectClasses({ CredentialsTest.class, diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/LoginV1TestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/LoginV1TestSuite.java index c26d89136a7..edf23f7452e 100644 --- a/tests/base/src/test/java/org/keycloak/tests/suites/LoginV1TestSuite.java +++ b/tests/base/src/test/java/org/keycloak/tests/suites/LoginV1TestSuite.java @@ -1,8 +1,9 @@ package org.keycloak.tests.suites; +import org.keycloak.tests.admin.AdminHeadersTest; + import org.junit.platform.suite.api.SelectClasses; import org.junit.platform.suite.api.Suite; -import org.keycloak.tests.admin.AdminHeadersTest; @Suite // TODO: Select relevant test classes or packages once they have been migrated diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/MultisiteTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/MultisiteTestSuite.java index b8847dc7965..c544e77825c 100644 --- a/tests/base/src/test/java/org/keycloak/tests/suites/MultisiteTestSuite.java +++ b/tests/base/src/test/java/org/keycloak/tests/suites/MultisiteTestSuite.java @@ -1,9 +1,5 @@ package org.keycloak.tests.suites; -import org.junit.platform.suite.api.AfterSuite; -import org.junit.platform.suite.api.BeforeSuite; -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; import org.keycloak.common.Profile; import org.keycloak.testframework.injection.SuiteSupport; import org.keycloak.testframework.server.KeycloakServerConfig; @@ -11,6 +7,11 @@ import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.tests.admin.client.SessionTest; import org.keycloak.tests.admin.concurrency.ConcurrentLoginTest; +import org.junit.platform.suite.api.AfterSuite; +import org.junit.platform.suite.api.BeforeSuite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + @Suite @SelectClasses({SessionTest.class, ConcurrentLoginTest.class}) public class MultisiteTestSuite { diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/VolatileSessionsTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/VolatileSessionsTestSuite.java index a5c417d027d..dc5bc7b0abd 100644 --- a/tests/base/src/test/java/org/keycloak/tests/suites/VolatileSessionsTestSuite.java +++ b/tests/base/src/test/java/org/keycloak/tests/suites/VolatileSessionsTestSuite.java @@ -1,9 +1,5 @@ package org.keycloak.tests.suites; -import org.junit.platform.suite.api.AfterSuite; -import org.junit.platform.suite.api.BeforeSuite; -import org.junit.platform.suite.api.SelectClasses; -import org.junit.platform.suite.api.Suite; import org.keycloak.common.Profile; import org.keycloak.testframework.injection.SuiteSupport; import org.keycloak.testframework.server.KeycloakServerConfig; @@ -11,6 +7,11 @@ import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.tests.admin.client.SessionTest; import org.keycloak.tests.admin.concurrency.ConcurrentLoginTest; +import org.junit.platform.suite.api.AfterSuite; +import org.junit.platform.suite.api.BeforeSuite; +import org.junit.platform.suite.api.SelectClasses; +import org.junit.platform.suite.api.Suite; + @Suite @SelectClasses({SessionTest.class, ConcurrentLoginTest.class}) public class VolatileSessionsTestSuite { diff --git a/tests/base/src/test/java/org/keycloak/tests/tracing/TracingProviderTest.java b/tests/base/src/test/java/org/keycloak/tests/tracing/TracingProviderTest.java index 878c2919af0..e5223c4f4cf 100644 --- a/tests/base/src/test/java/org/keycloak/tests/tracing/TracingProviderTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/tracing/TracingProviderTest.java @@ -1,5 +1,14 @@ package org.keycloak.tests.tracing; +import java.io.Serializable; + +import org.keycloak.testframework.annotations.KeycloakIntegrationTest; +import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; +import org.keycloak.testframework.remote.runonserver.RunOnServerClient; +import org.keycloak.testframework.server.KeycloakServerConfig; +import org.keycloak.testframework.server.KeycloakServerConfigBuilder; +import org.keycloak.tracing.TracingProvider; + import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.trace.Span; @@ -10,14 +19,6 @@ import io.opentelemetry.sdk.trace.data.ExceptionEventData; import io.opentelemetry.sdk.trace.data.StatusData; import io.opentelemetry.semconv.ExceptionAttributes; import org.junit.jupiter.api.Test; -import org.keycloak.testframework.annotations.KeycloakIntegrationTest; -import org.keycloak.testframework.remote.runonserver.InjectRunOnServer; -import org.keycloak.testframework.remote.runonserver.RunOnServerClient; -import org.keycloak.testframework.server.KeycloakServerConfig; -import org.keycloak.testframework.server.KeycloakServerConfigBuilder; -import org.keycloak.tracing.TracingProvider; - -import java.io.Serializable; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.emptyOrNullString; diff --git a/tests/base/src/test/java/org/keycloak/tests/welcomepage/WelcomePageTest.java b/tests/base/src/test/java/org/keycloak/tests/welcomepage/WelcomePageTest.java index a8ad92b620d..10594e34143 100644 --- a/tests/base/src/test/java/org/keycloak/tests/welcomepage/WelcomePageTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/welcomepage/WelcomePageTest.java @@ -1,7 +1,5 @@ package org.keycloak.tests.welcomepage; -import static org.junit.jupiter.api.Assertions.assertTrue; - import java.net.InetAddress; import java.net.MalformedURLException; import java.net.NetworkInterface; @@ -11,11 +9,6 @@ import java.util.Collections; import java.util.Enumeration; import java.util.List; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.admin.client.Keycloak; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.representations.idm.UserRepresentation; @@ -31,10 +24,18 @@ import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.LoginPage; import org.keycloak.testframework.ui.page.WelcomePage; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.openqa.selenium.WebDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; import org.openqa.selenium.support.ui.WebDriverWait; +import static org.junit.jupiter.api.Assertions.assertTrue; + @KeycloakIntegrationTest(config = WelcomePageTest.WelcomePageTestConfig.class) @TestMethodOrder(OrderAnnotation.class) public class WelcomePageTest { diff --git a/tests/base/src/test/java/org/keycloak/tests/welcomepage/WelcomePageWithServiceAccountTest.java b/tests/base/src/test/java/org/keycloak/tests/welcomepage/WelcomePageWithServiceAccountTest.java index 5b7c151520f..633cabf1f1a 100644 --- a/tests/base/src/test/java/org/keycloak/tests/welcomepage/WelcomePageWithServiceAccountTest.java +++ b/tests/base/src/test/java/org/keycloak/tests/welcomepage/WelcomePageWithServiceAccountTest.java @@ -1,14 +1,5 @@ package org.keycloak.tests.welcomepage; -import static org.junit.Assert.assertTrue; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.keycloak.tests.welcomepage.WelcomePageTest.assertOnAdminConsole; -import static org.keycloak.tests.welcomepage.WelcomePageTest.getPublicServerUrl; - -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UsersResource; @@ -23,8 +14,19 @@ import org.keycloak.testframework.server.KeycloakServerConfigBuilder; import org.keycloak.testframework.ui.annotations.InjectPage; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testframework.ui.page.WelcomePage; + +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.openqa.selenium.WebDriver; +import static org.keycloak.tests.welcomepage.WelcomePageTest.assertOnAdminConsole; +import static org.keycloak.tests.welcomepage.WelcomePageTest.getPublicServerUrl; + +import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; + @KeycloakIntegrationTest(config = WelcomePageWithServiceAccountTest.WelcomePageWithServiceAccountTestConfig.class) @TestMethodOrder(OrderAnnotation.class) public class WelcomePageWithServiceAccountTest { diff --git a/tests/clustering/src/test/java/org/keycloak/tests/clustering/JdbcPingCustomSchemaTest.java b/tests/clustering/src/test/java/org/keycloak/tests/clustering/JdbcPingCustomSchemaTest.java index 4a88a13b2a3..74b7451ba6e 100644 --- a/tests/clustering/src/test/java/org/keycloak/tests/clustering/JdbcPingCustomSchemaTest.java +++ b/tests/clustering/src/test/java/org/keycloak/tests/clustering/JdbcPingCustomSchemaTest.java @@ -1,12 +1,13 @@ package org.keycloak.tests.clustering; -import org.junit.jupiter.api.Test; import org.keycloak.testframework.annotations.InjectTestDatabase; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; import org.keycloak.testframework.database.TestDatabase; import org.keycloak.testframework.injection.LifeCycle; import org.keycloak.tests.db.CaseSensitiveSchemaTest; +import org.junit.jupiter.api.Test; + @KeycloakIntegrationTest(config = CaseSensitiveSchemaTest.CaseSensitiveServerConfig.class) public class JdbcPingCustomSchemaTest { @InjectTestDatabase(config = CaseSensitiveSchemaTest.CaseSensitiveDatabaseConfig.class, lifecycle = LifeCycle.CLASS) diff --git a/tests/clustering/src/test/java/org/keycloak/tests/compatibility/ClusteredOAuthClientTest.java b/tests/clustering/src/test/java/org/keycloak/tests/compatibility/ClusteredOAuthClientTest.java index b2515ea2b6f..380c98fdaee 100644 --- a/tests/clustering/src/test/java/org/keycloak/tests/compatibility/ClusteredOAuthClientTest.java +++ b/tests/clustering/src/test/java/org/keycloak/tests/compatibility/ClusteredOAuthClientTest.java @@ -1,10 +1,5 @@ package org.keycloak.tests.compatibility; -import org.htmlunit.WebClient; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; import org.keycloak.testframework.annotations.InjectLoadBalancer; import org.keycloak.testframework.annotations.InjectUser; import org.keycloak.testframework.annotations.KeycloakIntegrationTest; @@ -17,6 +12,12 @@ import org.keycloak.testframework.realm.UserConfigBuilder; import org.keycloak.testframework.ui.annotations.InjectWebDriver; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; + +import org.htmlunit.WebClient; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; import org.openqa.selenium.WebDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; diff --git a/tests/custom-providers/src/main/java/org/keycloak/testsuite/actions/DummyConfigurableRequiredActionFactory.java b/tests/custom-providers/src/main/java/org/keycloak/testsuite/actions/DummyConfigurableRequiredActionFactory.java index e661ca1ad7b..2a7cc86489c 100755 --- a/tests/custom-providers/src/main/java/org/keycloak/testsuite/actions/DummyConfigurableRequiredActionFactory.java +++ b/tests/custom-providers/src/main/java/org/keycloak/testsuite/actions/DummyConfigurableRequiredActionFactory.java @@ -17,6 +17,10 @@ package org.keycloak.testsuite.actions; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import org.keycloak.Config; import org.keycloak.authentication.RequiredActionContext; import org.keycloak.authentication.RequiredActionFactory; @@ -27,10 +31,6 @@ import org.keycloak.models.RequiredActionConfigModel; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - public class DummyConfigurableRequiredActionFactory implements RequiredActionFactory { public static final String PROVIDER_ID = "configurable-test-action"; diff --git a/tests/custom-providers/src/main/java/org/keycloak/testsuite/broker/oidc/OverwrittenMappersTestIdentityProvider.java b/tests/custom-providers/src/main/java/org/keycloak/testsuite/broker/oidc/OverwrittenMappersTestIdentityProvider.java index 1cec299bfd4..ff877d1e5cb 100644 --- a/tests/custom-providers/src/main/java/org/keycloak/testsuite/broker/oidc/OverwrittenMappersTestIdentityProvider.java +++ b/tests/custom-providers/src/main/java/org/keycloak/testsuite/broker/oidc/OverwrittenMappersTestIdentityProvider.java @@ -1,14 +1,14 @@ package org.keycloak.testsuite.broker.oidc; +import java.util.Arrays; +import java.util.List; + import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider; import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.broker.provider.IdentityProviderMapper; import org.keycloak.models.KeycloakSession; -import java.util.Arrays; -import java.util.List; - /** * @author Daniel Fesenmeyer */ diff --git a/tests/custom-providers/src/main/java/org/keycloak/testsuite/components/TestComponentImplProviderFactory.java b/tests/custom-providers/src/main/java/org/keycloak/testsuite/components/TestComponentImplProviderFactory.java index 3c55c7a7062..c332b37aeea 100644 --- a/tests/custom-providers/src/main/java/org/keycloak/testsuite/components/TestComponentImplProviderFactory.java +++ b/tests/custom-providers/src/main/java/org/keycloak/testsuite/components/TestComponentImplProviderFactory.java @@ -17,6 +17,8 @@ package org.keycloak.testsuite.components; +import java.util.List; + import org.keycloak.Config; import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; @@ -27,8 +29,6 @@ import org.keycloak.provider.ConfigurationValidationHelper; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; - import static org.keycloak.provider.ProviderConfigProperty.STRING_TYPE; /** diff --git a/tests/custom-providers/src/main/java/org/keycloak/testsuite/components/TestComponentProvider.java b/tests/custom-providers/src/main/java/org/keycloak/testsuite/components/TestComponentProvider.java index 29d1a42f89b..ac8c6813853 100644 --- a/tests/custom-providers/src/main/java/org/keycloak/testsuite/components/TestComponentProvider.java +++ b/tests/custom-providers/src/main/java/org/keycloak/testsuite/components/TestComponentProvider.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.components; -import org.keycloak.provider.Provider; - import java.util.List; import java.util.Map; +import org.keycloak.provider.Provider; + /** * @author Stian Thorgersen */ diff --git a/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProvider.java b/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProvider.java index d6f17429c8f..4019144d986 100644 --- a/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProvider.java +++ b/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProvider.java @@ -17,6 +17,11 @@ package org.keycloak.testsuite.federation; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.keycloak.component.ComponentModel; import org.keycloak.credential.CredentialInput; import org.keycloak.credential.CredentialInputValidator; @@ -32,11 +37,6 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.user.UserLookupProvider; import org.keycloak.storage.user.UserRegistrationProvider; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ @@ -147,4 +147,3 @@ public class DummyUserFederationProvider implements UserStorageProvider, } } - diff --git a/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProviderFactory.java b/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProviderFactory.java index 0a672c1216c..7f32b9b6e72 100644 --- a/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProviderFactory.java +++ b/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProviderFactory.java @@ -17,7 +17,12 @@ package org.keycloak.testsuite.federation; -import org.jboss.logging.Logger; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + import org.keycloak.Config; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; @@ -30,11 +35,7 @@ import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.user.ImportSynchronization; import org.keycloak.storage.user.SynchronizationResult; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java b/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java index 8676a7cfaa9..34e4f9a7297 100644 --- a/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java +++ b/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java @@ -16,7 +16,14 @@ */ package org.keycloak.testsuite.federation; -import org.jboss.logging.Logger; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ConcurrentSkipListSet; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.credential.CredentialInput; import org.keycloak.credential.CredentialInputUpdater; @@ -42,13 +49,7 @@ import org.keycloak.storage.user.UserLookupProvider; import org.keycloak.storage.user.UserQueryProvider; import org.keycloak.storage.user.UserRegistrationProvider; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ConcurrentSkipListSet; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Stream; +import org.jboss.logging.Logger; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; import static org.keycloak.utils.StreamsUtil.paginatedStream; diff --git a/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java b/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java index 50e35430cb5..c02e10f022f 100644 --- a/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java +++ b/tests/custom-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java @@ -16,13 +16,6 @@ */ package org.keycloak.testsuite.federation; -import org.keycloak.Config; -import org.keycloak.component.ComponentModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.storage.UserStorageProviderFactory; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -30,6 +23,13 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.keycloak.Config; +import org.keycloak.component.ComponentModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.provider.ProviderConfigProperty; +import org.keycloak.storage.UserStorageProviderFactory; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/AccountHelper.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/AccountHelper.java index 7bf1c68e7b7..1fc1e35d2e2 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/AccountHelper.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/AccountHelper.java @@ -16,18 +16,19 @@ */ package org.keycloak.testsuite.util; -import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.admin.client.resource.UserResource; import java.util.List; import java.util.Map; +import java.util.Optional; + +import jakarta.ws.rs.core.Response; + +import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.admin.client.resource.UserResource; import org.keycloak.models.credential.OTPCredentialModel; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.FederatedIdentityRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import jakarta.ws.rs.core.Response; -import java.util.Optional; - public class AccountHelper { public static UserRepresentation getUserRepresentation(RealmResource realm, String username) { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/IdentityProviderBuilder.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/IdentityProviderBuilder.java index bcce239960d..ba809f2988e 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/IdentityProviderBuilder.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/IdentityProviderBuilder.java @@ -18,9 +18,10 @@ package org.keycloak.testsuite.util; import java.util.HashMap; -import org.keycloak.representations.idm.IdentityProviderRepresentation; import java.util.Map; +import org.keycloak.representations.idm.IdentityProviderRepresentation; + /** * @author Stian Thorgersen */ diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpGetRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpGetRequest.java index b6dc63de61b..6c1a4fd1c8e 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpGetRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpGetRequest.java @@ -1,10 +1,11 @@ package org.keycloak.testsuite.util.oauth; +import java.io.IOException; + +import org.keycloak.utils.MediaType; + import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; -import org.keycloak.utils.MediaType; - -import java.io.IOException; public abstract class AbstractHttpGetRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpPostRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpPostRequest.java index 8b30c024ce6..62d39ca2eb6 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpPostRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpPostRequest.java @@ -1,14 +1,5 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.message.BasicNameValuePair; -import org.keycloak.OAuth2Constants; -import org.keycloak.util.BasicAuthHelper; -import org.keycloak.utils.MediaType; - import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -16,6 +7,16 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.keycloak.OAuth2Constants; +import org.keycloak.util.BasicAuthHelper; +import org.keycloak.utils.MediaType; + +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.message.BasicNameValuePair; + public abstract class AbstractHttpPostRequest { protected final AbstractOAuthClient client; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpResponse.java index 43ccfb80501..50321b6a464 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractHttpResponse.java @@ -1,17 +1,18 @@ package org.keycloak.testsuite.util.oauth; -import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.http.Header; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.util.EntityUtils; -import org.keycloak.OAuth2Constants; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; +import org.keycloak.OAuth2Constants; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.http.Header; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.util.EntityUtils; + public abstract class AbstractHttpResponse { private final CloseableHttpResponse response; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractOAuthClient.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractOAuthClient.java index a7ac01224b5..8ef242e4641 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractOAuthClient.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractOAuthClient.java @@ -1,6 +1,5 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.impl.client.CloseableHttpClient; import org.keycloak.OAuth2Constants; import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; import org.keycloak.representations.AccessToken; @@ -10,6 +9,8 @@ import org.keycloak.representations.JsonWebToken; import org.keycloak.representations.RefreshToken; import org.keycloak.testsuite.util.oauth.ciba.CibaClient; import org.keycloak.testsuite.util.oauth.device.DeviceClient; + +import org.apache.http.impl.client.CloseableHttpClient; import org.openqa.selenium.WebDriver; public abstract class AbstractOAuthClient { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractUrlBuilder.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractUrlBuilder.java index 363c319e603..ac8cbd664ee 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractUrlBuilder.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AbstractUrlBuilder.java @@ -1,14 +1,15 @@ package org.keycloak.testsuite.util.oauth; -import jakarta.ws.rs.core.UriBuilder; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; +import jakarta.ws.rs.core.UriBuilder; + +import org.keycloak.util.JsonSerialization; + public abstract class AbstractUrlBuilder { protected final AbstractOAuthClient client; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AccessTokenRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AccessTokenRequest.java index af68cc70056..abbe83c879b 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AccessTokenRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AccessTokenRequest.java @@ -1,10 +1,11 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.OAuth2Constants; import org.keycloak.util.TokenUtil; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class AccessTokenRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AccessTokenResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AccessTokenResponse.java index 7397f44f97f..112289ca11a 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AccessTokenResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AccessTokenResponse.java @@ -1,12 +1,13 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.keycloak.OAuth2Constants; - import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.keycloak.OAuth2Constants; + +import org.apache.http.client.methods.CloseableHttpResponse; + public class AccessTokenResponse extends AbstractHttpResponse { private String idToken; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AuthorizationEndpointResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AuthorizationEndpointResponse.java index 1f9dfdfc945..22bc3c8d1ba 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AuthorizationEndpointResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/AuthorizationEndpointResponse.java @@ -1,15 +1,16 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.utils.URLEncodedUtils; -import org.keycloak.OAuth2Constants; -import org.keycloak.protocol.oidc.utils.OIDCResponseMode; -import org.keycloak.protocol.oidc.utils.OIDCResponseType; -import org.openqa.selenium.WebDriver; - import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; +import org.keycloak.OAuth2Constants; +import org.keycloak.protocol.oidc.utils.OIDCResponseMode; +import org.keycloak.protocol.oidc.utils.OIDCResponseType; + +import org.apache.http.client.utils.URLEncodedUtils; +import org.openqa.selenium.WebDriver; + public class AuthorizationEndpointResponse { private boolean isRedirected; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/BackchannelLogoutRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/BackchannelLogoutRequest.java index 652e0db85d0..bf0f25ad7aa 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/BackchannelLogoutRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/BackchannelLogoutRequest.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.OAuth2Constants; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class BackchannelLogoutRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/BackchannelLogoutResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/BackchannelLogoutResponse.java index 621adf72bee..e423b9db1fe 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/BackchannelLogoutResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/BackchannelLogoutResponse.java @@ -1,9 +1,9 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; - import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; + public class BackchannelLogoutResponse extends AbstractHttpResponse { public BackchannelLogoutResponse(CloseableHttpResponse response) throws IOException { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ClientCredentialsGrantRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ClientCredentialsGrantRequest.java index 499424d8575..8143b00b818 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ClientCredentialsGrantRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ClientCredentialsGrantRequest.java @@ -1,10 +1,11 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.OAuth2Constants; import org.keycloak.util.TokenUtil; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class ClientCredentialsGrantRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/Endpoints.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/Endpoints.java index d1823038e6e..6c206265456 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/Endpoints.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/Endpoints.java @@ -1,6 +1,7 @@ package org.keycloak.testsuite.util.oauth; import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.protocol.oidc.grants.ciba.CibaGrantType; import org.keycloak.protocol.oidc.grants.device.DeviceGrantType; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/FetchExternalIdpTokenRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/FetchExternalIdpTokenRequest.java index 5160439a289..e45e894534d 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/FetchExternalIdpTokenRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/FetchExternalIdpTokenRequest.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.util.oauth; -import com.fasterxml.jackson.databind.node.ObjectNode; -import jakarta.ws.rs.core.UriBuilder; -import org.apache.http.client.methods.CloseableHttpResponse; - import java.io.IOException; import java.util.Map; +import jakarta.ws.rs.core.UriBuilder; + +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.http.client.methods.CloseableHttpResponse; + public class FetchExternalIdpTokenRequest extends AbstractHttpGetRequest { private final String providerAlias; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/IntrospectionRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/IntrospectionRequest.java index 64e18f54d79..67d9020f970 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/IntrospectionRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/IntrospectionRequest.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.utils.MediaType; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class IntrospectionRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/IntrospectionResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/IntrospectionResponse.java index 9eefc3aa14b..86dd7418185 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/IntrospectionResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/IntrospectionResponse.java @@ -1,11 +1,12 @@ package org.keycloak.testsuite.util.oauth; -import com.fasterxml.jackson.databind.JsonNode; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.representations.oidc.TokenMetadataRepresentation; import org.keycloak.util.JsonSerialization; -import java.io.IOException; +import com.fasterxml.jackson.databind.JsonNode; +import org.apache.http.client.methods.CloseableHttpResponse; public class IntrospectionResponse extends AbstractHttpResponse { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JWTAuthorizationGrantRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JWTAuthorizationGrantRequest.java index 64fee5db712..d0c6f530b49 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JWTAuthorizationGrantRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JWTAuthorizationGrantRequest.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.OAuth2Constants; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class JWTAuthorizationGrantRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JwksRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JwksRequest.java index 1a657741f6b..f20aceddc42 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JwksRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JwksRequest.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.HttpGet; +import java.io.IOException; + import org.keycloak.jose.jwk.JSONWebKeySet; -import java.io.IOException; +import org.apache.http.client.methods.HttpGet; public class JwksRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JwksResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JwksResponse.java index 85c60d95d0d..892390c07c4 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JwksResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/JwksResponse.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.jose.jwk.JSONWebKeySet; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class JwksResponse extends AbstractHttpResponse { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/KeyManager.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/KeyManager.java index 4d156519100..7be5f850756 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/KeyManager.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/KeyManager.java @@ -1,5 +1,10 @@ package org.keycloak.testsuite.util.oauth; +import java.io.IOException; +import java.security.PublicKey; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.crypto.KeyUse; import org.keycloak.crypto.KeyWrapper; import org.keycloak.jose.jwk.JSONWebKeySet; @@ -7,11 +12,6 @@ import org.keycloak.jose.jwk.JWK; import org.keycloak.jose.jwk.JWKParser; import org.keycloak.jose.jwk.OKPPublicJWK; -import java.io.IOException; -import java.security.PublicKey; -import java.util.HashMap; -import java.util.Map; - public class KeyManager { private final AbstractOAuthClient client; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/LogoutRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/LogoutRequest.java index d41a7986822..17fb0af90f1 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/LogoutRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/LogoutRequest.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.OAuth2Constants; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class LogoutRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/LogoutResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/LogoutResponse.java index 78c19799cee..9996c724d12 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/LogoutResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/LogoutResponse.java @@ -1,9 +1,9 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; - import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; + public class LogoutResponse extends AbstractHttpResponse { public LogoutResponse(CloseableHttpResponse response) throws IOException { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OpenIDProviderConfigurationRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OpenIDProviderConfigurationRequest.java index 72fc68a7f05..4e4a20f7884 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OpenIDProviderConfigurationRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OpenIDProviderConfigurationRequest.java @@ -1,9 +1,9 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; - import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; + public class OpenIDProviderConfigurationRequest extends AbstractHttpGetRequest { public OpenIDProviderConfigurationRequest(AbstractOAuthClient client) { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OpenIDProviderConfigurationResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OpenIDProviderConfigurationResponse.java index b24470b7a92..3a6abfd5cb2 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OpenIDProviderConfigurationResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/OpenIDProviderConfigurationResponse.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class OpenIDProviderConfigurationResponse extends AbstractHttpResponse { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ParRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ParRequest.java index 6d8afc46c16..8d861a1c56d 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ParRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ParRequest.java @@ -1,11 +1,12 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.OAuth2Constants; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.util.TokenUtil; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class ParRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ParResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ParResponse.java index e7c8d7e8697..174a260579b 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ParResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ParResponse.java @@ -1,10 +1,10 @@ package org.keycloak.testsuite.util.oauth; +import java.io.IOException; + import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.http.client.methods.CloseableHttpResponse; -import java.io.IOException; - public class ParResponse extends AbstractHttpResponse { private String requestUri; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/PasswordGrantRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/PasswordGrantRequest.java index 38d5624b5a1..ee2de1873c1 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/PasswordGrantRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/PasswordGrantRequest.java @@ -1,10 +1,11 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.OAuth2Constants; import org.keycloak.util.TokenUtil; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class PasswordGrantRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/RefreshRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/RefreshRequest.java index 479640b59ac..ccf45c3c949 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/RefreshRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/RefreshRequest.java @@ -1,10 +1,11 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.OAuth2Constants; import org.keycloak.util.TokenUtil; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class RefreshRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenExchangeRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenExchangeRequest.java index 8c4c6eb8a69..547214e5597 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenExchangeRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenExchangeRequest.java @@ -1,12 +1,13 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.keycloak.OAuth2Constants; - import java.io.IOException; import java.util.Arrays; import java.util.List; +import org.keycloak.OAuth2Constants; + +import org.apache.http.client.methods.CloseableHttpResponse; + public class TokenExchangeRequest extends AbstractHttpPostRequest { private final String subjectToken; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenRevocationRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenRevocationRequest.java index b1ba413f61a..131e48659fc 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenRevocationRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenRevocationRequest.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.util.TokenUtil; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class TokenRevocationRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenRevocationResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenRevocationResponse.java index 5f3c3de7ad8..6c20cb15220 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenRevocationResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/TokenRevocationResponse.java @@ -1,9 +1,9 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; - import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; + public class TokenRevocationResponse extends AbstractHttpResponse { public TokenRevocationResponse(CloseableHttpResponse response) throws IOException { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/UserInfoRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/UserInfoRequest.java index 7594a1fd0e1..15270f58434 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/UserInfoRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/UserInfoRequest.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.util.TokenUtil; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class UserInfoRequest extends AbstractHttpGetRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/UserInfoResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/UserInfoResponse.java index 2aedb384916..e656d2ef118 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/UserInfoResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/UserInfoResponse.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.representations.UserInfo; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class UserInfoResponse extends AbstractHttpResponse { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/AuthenticationRequestAcknowledgement.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/AuthenticationRequestAcknowledgement.java index fae1fede340..a89b6a7a258 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/AuthenticationRequestAcknowledgement.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/AuthenticationRequestAcknowledgement.java @@ -1,10 +1,11 @@ package org.keycloak.testsuite.util.oauth.ciba; +import java.io.IOException; + +import org.keycloak.testsuite.util.oauth.AbstractHttpResponse; + import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.http.client.methods.CloseableHttpResponse; -import org.keycloak.testsuite.util.oauth.AbstractHttpResponse; - -import java.io.IOException; public class AuthenticationRequestAcknowledgement extends AbstractHttpResponse { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/BackchannelAuthenticationRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/BackchannelAuthenticationRequest.java index ac83cc4a584..a2f9a742f0c 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/BackchannelAuthenticationRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/BackchannelAuthenticationRequest.java @@ -1,14 +1,15 @@ package org.keycloak.testsuite.util.oauth.ciba; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; +import java.util.Map; + import org.keycloak.OAuth2Constants; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.grants.ciba.CibaGrantType; import org.keycloak.testsuite.util.oauth.AbstractHttpPostRequest; import org.keycloak.testsuite.util.oauth.AbstractOAuthClient; -import java.io.IOException; -import java.util.Map; +import org.apache.http.client.methods.CloseableHttpResponse; public class BackchannelAuthenticationRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/BackchannelAuthenticationTokenRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/BackchannelAuthenticationTokenRequest.java index 097be9bbe09..1ecebb13691 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/BackchannelAuthenticationTokenRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/BackchannelAuthenticationTokenRequest.java @@ -1,12 +1,13 @@ package org.keycloak.testsuite.util.oauth.ciba; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.OAuth2Constants; import org.keycloak.testsuite.util.oauth.AbstractHttpPostRequest; import org.keycloak.testsuite.util.oauth.AbstractOAuthClient; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; import static org.keycloak.protocol.oidc.grants.ciba.CibaGrantType.AUTH_REQ_ID; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/CibaClient.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/CibaClient.java index d6d789b2470..174cc03b158 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/CibaClient.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/ciba/CibaClient.java @@ -1,15 +1,16 @@ package org.keycloak.testsuite.util.oauth.ciba; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; import org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse; import org.keycloak.testsuite.util.oauth.AbstractOAuthClient; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; + public class CibaClient { private final AbstractOAuthClient client; diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceAuthorizationRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceAuthorizationRequest.java index 8063078284f..6663a7ceefe 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceAuthorizationRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceAuthorizationRequest.java @@ -1,12 +1,13 @@ package org.keycloak.testsuite.util.oauth.device; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.OAuth2Constants; import org.keycloak.testsuite.util.oauth.AbstractHttpPostRequest; import org.keycloak.testsuite.util.oauth.AbstractOAuthClient; import org.keycloak.testsuite.util.oauth.PkceGenerator; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class DeviceAuthorizationRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceAuthorizationResponse.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceAuthorizationResponse.java index f1c1c8c50fb..a76a33065dc 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceAuthorizationResponse.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceAuthorizationResponse.java @@ -1,10 +1,11 @@ package org.keycloak.testsuite.util.oauth.device; +import java.io.IOException; + +import org.keycloak.testsuite.util.oauth.AbstractHttpResponse; + import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.http.client.methods.CloseableHttpResponse; -import org.keycloak.testsuite.util.oauth.AbstractHttpResponse; - -import java.io.IOException; public class DeviceAuthorizationResponse extends AbstractHttpResponse { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceTokenRequest.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceTokenRequest.java index 0507ca9024c..bc35b52877d 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceTokenRequest.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/oauth/device/DeviceTokenRequest.java @@ -1,13 +1,14 @@ package org.keycloak.testsuite.util.oauth.device; -import org.apache.http.client.methods.CloseableHttpResponse; +import java.io.IOException; + import org.keycloak.OAuth2Constants; import org.keycloak.testsuite.util.oauth.AbstractHttpPostRequest; import org.keycloak.testsuite.util.oauth.AbstractOAuthClient; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.PkceGenerator; -import java.io.IOException; +import org.apache.http.client.methods.CloseableHttpResponse; public class DeviceTokenRequest extends AbstractHttpPostRequest { diff --git a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/userprofile/UserProfileUtil.java b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/userprofile/UserProfileUtil.java index 300abef59b1..9479a313872 100644 --- a/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/userprofile/UserProfileUtil.java +++ b/tests/utils-shared/src/main/java/org/keycloak/testsuite/util/userprofile/UserProfileUtil.java @@ -1,5 +1,8 @@ package org.keycloak.testsuite.util.userprofile; +import java.io.IOException; +import java.util.Set; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.models.UserModel; @@ -9,9 +12,6 @@ import org.keycloak.representations.userprofile.config.UPAttributeRequired; import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.Set; - import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; @@ -66,4 +66,3 @@ public class UserProfileUtil { } } - diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/Assert.java b/tests/utils/src/main/java/org/keycloak/tests/utils/Assert.java index 7d785eaf2ce..4c53d3d9067 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/Assert.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/Assert.java @@ -17,8 +17,12 @@ package org.keycloak.tests.utils; * limitations under the License. */ -import org.hamcrest.MatcherAssert; -import org.junit.jupiter.api.Assertions; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation; @@ -33,11 +37,8 @@ import org.keycloak.representations.idm.UserProfileAttributeMetadata; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.info.ThemeInfoRepresentation; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.hamcrest.MatcherAssert; +import org.junit.jupiter.api.Assertions; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsInAnyOrder; @@ -175,4 +176,3 @@ public class Assert extends Assertions { } } } - diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/JsonTestUtils.java b/tests/utils/src/main/java/org/keycloak/tests/utils/JsonTestUtils.java index 2a30bafda5b..e8687b8b05d 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/JsonTestUtils.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/JsonTestUtils.java @@ -19,10 +19,11 @@ package org.keycloak.tests.utils; -import org.junit.jupiter.api.Assertions; +import java.io.IOException; + import org.keycloak.util.JsonSerialization; -import java.io.IOException; +import org.junit.jupiter.api.Assertions; /** * Utility for comparing JSON objects diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/KeyUtils.java b/tests/utils/src/main/java/org/keycloak/tests/utils/KeyUtils.java index cc8e7656d4e..106f6945ffa 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/KeyUtils.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/KeyUtils.java @@ -1,7 +1,25 @@ package org.keycloak.tests.utils; +import java.security.InvalidAlgorithmParameterException; +import java.security.KeyFactory; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.spec.ECGenParameterSpec; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; +import java.util.Base64; +import java.util.function.Predicate; +import java.util.stream.Stream; +import javax.crypto.KeyGenerator; +import javax.crypto.SecretKey; + import jakarta.ws.rs.core.Response; -import org.junit.jupiter.api.Assertions; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.util.BouncyIntegration; @@ -18,23 +36,7 @@ import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.KeysMetadataRepresentation; import org.keycloak.tests.utils.admin.ApiUtil; -import javax.crypto.KeyGenerator; -import javax.crypto.SecretKey; -import java.security.InvalidAlgorithmParameterException; -import java.security.KeyFactory; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.spec.ECGenParameterSpec; -import java.security.spec.InvalidKeySpecException; -import java.security.spec.PKCS8EncodedKeySpec; -import java.security.spec.X509EncodedKeySpec; -import java.util.Base64; -import java.util.function.Predicate; -import java.util.stream.Stream; +import org.junit.jupiter.api.Assertions; /** diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/MailUtils.java b/tests/utils/src/main/java/org/keycloak/tests/utils/MailUtils.java index 0e6659e9616..ef9bc94d21b 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/MailUtils.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/MailUtils.java @@ -17,15 +17,15 @@ package org.keycloak.tests.utils; +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import jakarta.mail.Address; import jakarta.mail.MessagingException; import jakarta.mail.Multipart; import jakarta.mail.internet.MimeMessage; -import java.io.IOException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import static org.junit.jupiter.api.Assertions.assertEquals; /** diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/admin/AdminEventPaths.java b/tests/utils/src/main/java/org/keycloak/tests/utils/admin/AdminEventPaths.java index f26620e3aae..015873044c0 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/admin/AdminEventPaths.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/admin/AdminEventPaths.java @@ -17,7 +17,10 @@ package org.keycloak.tests.utils.admin; +import java.net.URI; + import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.admin.client.resource.AttackDetectionResource; import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.ClientAttributeCertificateResource; @@ -40,8 +43,6 @@ import org.keycloak.admin.client.resource.RolesResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.admin.client.resource.UsersResource; -import java.net.URI; - /** * @author Marek Posolda */ diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/admin/ApiUtil.java b/tests/utils/src/main/java/org/keycloak/tests/utils/admin/ApiUtil.java index f996956d611..73d7d15a14c 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/admin/ApiUtil.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/admin/ApiUtil.java @@ -16,8 +16,13 @@ */ package org.keycloak.tests.utils.admin; -import org.jboss.logging.Logger; -import org.junit.jupiter.api.Assertions; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientScopeResource; @@ -35,11 +40,8 @@ import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import jakarta.ws.rs.core.Response; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; +import org.jboss.logging.Logger; +import org.junit.jupiter.api.Assertions; import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD; diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/admin/GenerateKeystoreForTestUtil.java b/tests/utils/src/main/java/org/keycloak/tests/utils/admin/GenerateKeystoreForTestUtil.java index 9b9e3c1ea53..7957441fd05 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/admin/GenerateKeystoreForTestUtil.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/admin/GenerateKeystoreForTestUtil.java @@ -1,11 +1,5 @@ package org.keycloak.tests.utils.admin; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.CertificateUtils; -import org.keycloak.common.util.KeyUtils; -import org.keycloak.common.util.PemUtils; -import org.keycloak.representations.idm.CertificateRepresentation; - import java.io.File; import java.io.FileOutputStream; import java.nio.file.Path; @@ -15,6 +9,12 @@ import java.security.PrivateKey; import java.security.cert.Certificate; import java.security.cert.X509Certificate; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.CertificateUtils; +import org.keycloak.common.util.KeyUtils; +import org.keycloak.common.util.PemUtils; +import org.keycloak.representations.idm.CertificateRepresentation; + public class GenerateKeystoreForTestUtil { private final static Path KEYSTORES_DIR = Path.of(System.getProperty("java.io.tmpdir")); diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/HttpResponseBodyMatcher.java b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/HttpResponseBodyMatcher.java index 6a3eab8d59e..8896e1876be 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/HttpResponseBodyMatcher.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/HttpResponseBodyMatcher.java @@ -16,15 +16,16 @@ */ package org.keycloak.tests.utils.matchers; +import java.io.IOException; + import jakarta.ws.rs.core.Response; + import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; -import java.io.IOException; - /** * Matcher for matching status code of {@link Response} instance. * @author hmlnarik diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/HttpResponseStatusCodeMatcher.java b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/HttpResponseStatusCodeMatcher.java index bee5f04a8ba..e350677fcf7 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/HttpResponseStatusCodeMatcher.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/HttpResponseStatusCodeMatcher.java @@ -16,15 +16,16 @@ */ package org.keycloak.tests.utils.matchers; +import java.io.IOException; + import jakarta.ws.rs.core.Response; + import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; -import java.io.IOException; - /** * Matcher for matching status code of {@link Response} instance. * @author hmlnarik diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/Matchers.java b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/Matchers.java index fd09745ca53..bc6872cb4b7 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/Matchers.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/Matchers.java @@ -16,9 +16,12 @@ */ package org.keycloak.tests.utils.matchers; +import java.net.URI; +import java.util.Arrays; +import java.util.Map; + import jakarta.ws.rs.core.Response; -import org.apache.http.HttpResponse; -import org.hamcrest.Matcher; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; @@ -26,9 +29,8 @@ import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.dom.saml.v2.protocol.StatusResponseType; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; -import java.net.URI; -import java.util.Arrays; -import java.util.Map; +import org.apache.http.HttpResponse; +import org.hamcrest.Matcher; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.instanceOf; diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseBodyMatcher.java b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseBodyMatcher.java index bd64f4f5551..97d34b3665a 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseBodyMatcher.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseBodyMatcher.java @@ -17,6 +17,7 @@ package org.keycloak.tests.utils.matchers; import jakarta.ws.rs.core.Response; + import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseHeaderMatcher.java b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseHeaderMatcher.java index 3c35a73538d..e650e1b41da 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseHeaderMatcher.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseHeaderMatcher.java @@ -16,13 +16,14 @@ */ package org.keycloak.tests.utils.matchers; +import java.util.Map; + import jakarta.ws.rs.core.Response; + import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; -import java.util.Map; - /** * Matcher for matching status code of {@link Response} instance. * @author hmlnarik diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseStatusCodeMatcher.java b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseStatusCodeMatcher.java index cafa4c4bf69..0364d6805c9 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseStatusCodeMatcher.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/ResponseStatusCodeMatcher.java @@ -17,6 +17,7 @@ package org.keycloak.tests.utils.matchers; import jakarta.ws.rs.core.Response; + import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlLogoutRequestTypeMatcher.java b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlLogoutRequestTypeMatcher.java index 43f4c25ced1..215664b1ca9 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlLogoutRequestTypeMatcher.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlLogoutRequestTypeMatcher.java @@ -5,13 +5,14 @@ */ package org.keycloak.tests.utils.matchers; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; +import java.net.URI; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; -import java.net.URI; +import org.hamcrest.BaseMatcher; +import org.hamcrest.Description; +import org.hamcrest.Matcher; import static org.hamcrest.Matchers.is; diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlResponseTypeMatcher.java b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlResponseTypeMatcher.java index 38ae42387a6..4bb35de5196 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlResponseTypeMatcher.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlResponseTypeMatcher.java @@ -5,14 +5,15 @@ */ package org.keycloak.tests.utils.matchers; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; +import java.net.URI; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; -import java.net.URI; +import org.hamcrest.BaseMatcher; +import org.hamcrest.Description; +import org.hamcrest.Matcher; import static org.hamcrest.Matchers.is; diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlStatusResponseTypeMatcher.java b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlStatusResponseTypeMatcher.java index cb2a412f4f3..36274f7b58f 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlStatusResponseTypeMatcher.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/matchers/SamlStatusResponseTypeMatcher.java @@ -5,16 +5,17 @@ */ package org.keycloak.tests.utils.matchers; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.protocol.StatusCodeType; import org.keycloak.dom.saml.v2.protocol.StatusResponseType; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; +import org.hamcrest.BaseMatcher; +import org.hamcrest.Description; +import org.hamcrest.Matcher; import static org.hamcrest.Matchers.is; diff --git a/tests/utils/src/main/java/org/keycloak/tests/utils/runonserver/RunHelpers.java b/tests/utils/src/main/java/org/keycloak/tests/utils/runonserver/RunHelpers.java index 2911746c5ec..a09b902a590 100644 --- a/tests/utils/src/main/java/org/keycloak/tests/utils/runonserver/RunHelpers.java +++ b/tests/utils/src/main/java/org/keycloak/tests/utils/runonserver/RunHelpers.java @@ -1,5 +1,8 @@ package org.keycloak.tests.utils.runonserver; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.credential.CredentialModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -10,9 +13,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testframework.remote.providers.runonserver.FetchOnServer; import org.keycloak.testframework.remote.providers.runonserver.FetchOnServerWrapper; -import java.util.List; -import java.util.stream.Collectors; - /** * Created by st on 26.01.17. */ diff --git a/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerProvider.java b/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerProvider.java index f1ae0fad265..6361dc5ebf9 100644 --- a/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerProvider.java +++ b/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerProvider.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.arquillian.container; import java.util.List; + import org.jboss.shrinkwrap.descriptor.spi.node.Node; /** diff --git a/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java b/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java index 6338ce51080..1c150515b35 100644 --- a/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java +++ b/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java @@ -22,6 +22,7 @@ import java.util.Iterator; import java.util.List; import java.util.ServiceConfigurationError; import java.util.ServiceLoader; + import org.jboss.shrinkwrap.descriptor.spi.node.Node; /** diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/examples/providersoverride/CustomDefaultEmailSenderProvider1.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/examples/providersoverride/CustomDefaultEmailSenderProvider1.java index 5e0ac7c1a04..d5a2be40b1f 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/examples/providersoverride/CustomDefaultEmailSenderProvider1.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/examples/providersoverride/CustomDefaultEmailSenderProvider1.java @@ -19,12 +19,12 @@ package org.keycloak.examples.providersoverride; +import java.util.Map; + import org.keycloak.email.DefaultEmailSenderProvider; import org.keycloak.email.EmailAuthenticator; import org.keycloak.models.KeycloakSession; -import java.util.Map; - /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/examples/providersoverride/CustomDefaultEmailSenderProvider2.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/examples/providersoverride/CustomDefaultEmailSenderProvider2.java index aec705331bb..e37dfead9d9 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/examples/providersoverride/CustomDefaultEmailSenderProvider2.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/examples/providersoverride/CustomDefaultEmailSenderProvider2.java @@ -19,12 +19,12 @@ package org.keycloak.examples.providersoverride; +import java.util.Map; + import org.keycloak.email.DefaultEmailSenderProvider; import org.keycloak.email.EmailAuthenticator; import org.keycloak.models.KeycloakSession; -import java.util.Map; - /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/actions/DummyConfigurableRequiredActionFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/actions/DummyConfigurableRequiredActionFactory.java index 961e71f6f0b..6ab8c4b5cfb 100755 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/actions/DummyConfigurableRequiredActionFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/actions/DummyConfigurableRequiredActionFactory.java @@ -17,6 +17,9 @@ package org.keycloak.testsuite.actions; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.authentication.RequiredActionContext; import org.keycloak.authentication.RequiredActionFactory; @@ -27,9 +30,6 @@ import org.keycloak.models.RequiredActionConfigModel; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.List; -import java.util.Map; - public class DummyConfigurableRequiredActionFactory implements RequiredActionFactory { public static final String PROVIDER_ID = "configurable-test-action"; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/CustomAuthenticationFlowCallbackFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/CustomAuthenticationFlowCallbackFactory.java index 6d1a7a25c60..0808f399d78 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/CustomAuthenticationFlowCallbackFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/CustomAuthenticationFlowCallbackFactory.java @@ -17,6 +17,8 @@ package org.keycloak.testsuite.authentication; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowCallbackFactory; import org.keycloak.authentication.Authenticator; @@ -25,8 +27,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Martin Bartos */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/CustomTestingSamlArtifactResolver.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/CustomTestingSamlArtifactResolver.java index ea3196f5d38..6f5a3a449de 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/CustomTestingSamlArtifactResolver.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/CustomTestingSamlArtifactResolver.java @@ -1,10 +1,5 @@ package org.keycloak.testsuite.authentication; -import org.keycloak.models.AuthenticatedClientSessionModel; -import org.keycloak.models.ClientModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.protocol.saml.ArtifactResolver; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -12,6 +7,11 @@ import java.util.ArrayList; import java.util.Base64; import java.util.List; +import org.keycloak.models.AuthenticatedClientSessionModel; +import org.keycloak.models.ClientModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.protocol.saml.ArtifactResolver; + import static org.keycloak.testsuite.authentication.CustomTestingSamlArtifactResolverFactory.TYPE_CODE; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/DelayedAuthenticatorFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/DelayedAuthenticatorFactory.java index ec2fb8cc410..9e5ce07bbf9 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/DelayedAuthenticatorFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/DelayedAuthenticatorFactory.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.authentication; import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/ExpectedParamAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/ExpectedParamAuthenticator.java index dcb90821d0d..2ed03f6b499 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/ExpectedParamAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/ExpectedParamAuthenticator.java @@ -17,7 +17,6 @@ package org.keycloak.testsuite.authentication; -import org.jboss.logging.Logger; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; import org.keycloak.models.KeycloakSession; @@ -25,6 +24,8 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.protocol.oidc.endpoints.AuthorizationEndpoint; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/PushButtonAuthenticatorFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/PushButtonAuthenticatorFactory.java index 84b177be14b..57330a1c87b 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/PushButtonAuthenticatorFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/PushButtonAuthenticatorFactory.java @@ -17,6 +17,9 @@ package org.keycloak.testsuite.authentication; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -26,9 +29,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.ArrayList; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/SetUserAttributeAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/SetUserAttributeAuthenticator.java index 456441aa0ab..86402a5ecb3 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/SetUserAttributeAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/SetUserAttributeAuthenticator.java @@ -1,5 +1,9 @@ package org.keycloak.testsuite.authentication; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.Authenticator; @@ -7,10 +11,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - public class SetUserAttributeAuthenticator implements Authenticator { @Override public void authenticate(AuthenticationFlowContext context) { diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/SetUserAttributeAuthenticatorFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/SetUserAttributeAuthenticatorFactory.java index e987aa61157..63191799964 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/SetUserAttributeAuthenticatorFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/authentication/SetUserAttributeAuthenticatorFactory.java @@ -1,5 +1,8 @@ package org.keycloak.testsuite.authentication; +import java.util.Arrays; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; @@ -8,9 +11,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Arrays; -import java.util.List; - public class SetUserAttributeAuthenticatorFactory implements AuthenticatorFactory { diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/ClientIdRequiredJWTClientAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/ClientIdRequiredJWTClientAuthenticator.java index 7700372849f..d6bb3efeecb 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/ClientIdRequiredJWTClientAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/ClientIdRequiredJWTClientAuthenticator.java @@ -17,16 +17,17 @@ package org.keycloak.testsuite.broker.oidc; +import java.util.Collections; +import java.util.Set; + import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.ClientAuthenticationFlowContext; import org.keycloak.authentication.authenticators.client.ClientAuthUtil; import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; -import java.util.Collections; -import java.util.Set; - /** * A {@link JWTClientAuthenticator} that requires the optional client_id parameter. * diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/MissingUseJwksRestResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/MissingUseJwksRestResource.java index d5f927165b9..09b002a166b 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/MissingUseJwksRestResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/MissingUseJwksRestResource.java @@ -23,6 +23,12 @@ import java.util.List; import java.util.Objects; import java.util.Optional; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.crypto.KeyType; import org.keycloak.jose.jwk.JSONWebKeySet; import org.keycloak.jose.jwk.JWK; @@ -30,12 +36,6 @@ import org.keycloak.jose.jwk.JWKBuilder; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; - public class MissingUseJwksRestResource { private final KeycloakSession session; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/OverwrittenMappersTestIdentityProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/OverwrittenMappersTestIdentityProvider.java index 1cec299bfd4..ff877d1e5cb 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/OverwrittenMappersTestIdentityProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/OverwrittenMappersTestIdentityProvider.java @@ -1,14 +1,14 @@ package org.keycloak.testsuite.broker.oidc; +import java.util.Arrays; +import java.util.List; + import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider; import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.broker.provider.IdentityProviderMapper; import org.keycloak.models.KeycloakSession; -import java.util.Arrays; -import java.util.List; - /** * @author Daniel Fesenmeyer */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/TestKeycloakOidcIdentityProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/TestKeycloakOidcIdentityProviderFactory.java index 34485661532..09ee3a61474 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/TestKeycloakOidcIdentityProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/TestKeycloakOidcIdentityProviderFactory.java @@ -22,6 +22,7 @@ import java.util.HashSet; import java.util.Set; import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.broker.oidc.KeycloakOIDCIdentityProvider; import org.keycloak.broker.oidc.KeycloakOIDCIdentityProviderFactory; import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/UnsupportedKeyJwksRestResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/UnsupportedKeyJwksRestResource.java index 57e26df23b8..2da736ea66d 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/UnsupportedKeyJwksRestResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/oidc/UnsupportedKeyJwksRestResource.java @@ -25,6 +25,12 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; + import org.keycloak.crypto.KeyType; import org.keycloak.jose.jwk.JSONWebKeySet; import org.keycloak.jose.jwk.JWK; @@ -32,12 +38,6 @@ import org.keycloak.jose.jwk.JWKBuilder; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; - public class UnsupportedKeyJwksRestResource { private final KeycloakSession session; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/provider/MultiValuedTestIdPMapper.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/provider/MultiValuedTestIdPMapper.java index 553eb3c23b4..9ef416b0294 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/provider/MultiValuedTestIdPMapper.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/broker/provider/MultiValuedTestIdPMapper.java @@ -17,12 +17,12 @@ package org.keycloak.testsuite.broker.provider; -import org.keycloak.broker.provider.AbstractIdentityProviderMapper; -import org.keycloak.provider.ProviderConfigProperty; - import java.util.ArrayList; import java.util.List; +import org.keycloak.broker.provider.AbstractIdentityProviderMapper; +import org.keycloak.provider.ProviderConfigProperty; + /** * Testing IdP mapper with multivalued property * diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/components/amphibian/TestAmphibianProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/components/amphibian/TestAmphibianProvider.java index 4b6c76fbe65..7cbe5b81a71 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/components/amphibian/TestAmphibianProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/components/amphibian/TestAmphibianProvider.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.components.amphibian; -import org.keycloak.provider.Provider; - import java.util.Map; +import org.keycloak.provider.Provider; + /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/components/amphibian/TestAmphibianProviderFactoryImpl.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/components/amphibian/TestAmphibianProviderFactoryImpl.java index dfcc4d75a2e..8871dd1d050 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/components/amphibian/TestAmphibianProviderFactoryImpl.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/components/amphibian/TestAmphibianProviderFactoryImpl.java @@ -17,6 +17,10 @@ package org.keycloak.testsuite.components.amphibian; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.Config; import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; @@ -27,10 +31,6 @@ import org.keycloak.provider.ConfigurationValidationHelper; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; -import java.util.HashMap; -import java.util.List; - -import java.util.Map; import static org.keycloak.provider.ProviderConfigProperty.STRING_TYPE; public class TestAmphibianProviderFactoryImpl implements TestAmphibianProviderFactory { diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/jpa/ExampleJpaEntityProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/jpa/ExampleJpaEntityProvider.java index 37d0575a95f..2f876329c9e 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/jpa/ExampleJpaEntityProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/jpa/ExampleJpaEntityProvider.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.domainextension.jpa; -import org.keycloak.connections.jpa.entityprovider.JpaEntityProvider; - import java.util.Collections; import java.util.List; +import org.keycloak.connections.jpa.entityprovider.JpaEntityProvider; + /** * @author Erik Mulder * diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java index 6b74e28f158..7239b759bb0 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java @@ -17,10 +17,7 @@ package org.keycloak.testsuite.domainextension.rest; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.models.KeycloakSession; -import org.keycloak.testsuite.domainextension.CompanyRepresentation; -import org.keycloak.testsuite.domainextension.spi.ExampleService; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -31,7 +28,12 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.models.KeycloakSession; +import org.keycloak.testsuite.domainextension.CompanyRepresentation; +import org.keycloak.testsuite.domainextension.spi.ExampleService; + +import org.jboss.resteasy.reactive.NoCache; public class CompanyResource { diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/ExampleRestResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/ExampleRestResource.java index d0b0e04b48f..27299f3a359 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/ExampleRestResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/ExampleRestResource.java @@ -17,14 +17,14 @@ package org.keycloak.testsuite.domainextension.rest; -import org.keycloak.models.KeycloakSession; -import org.keycloak.services.managers.AppAuthManager; -import org.keycloak.services.managers.AuthenticationManager; - import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.NotAuthorizedException; import jakarta.ws.rs.Path; +import org.keycloak.models.KeycloakSession; +import org.keycloak.services.managers.AppAuthManager; +import org.keycloak.services.managers.AuthenticationManager; + public class ExampleRestResource { private final KeycloakSession session; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/ExampleService.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/ExampleService.java index b17fba99a08..dd47d96ebfe 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/ExampleService.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/ExampleService.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.domainextension.spi; +import java.util.List; + import org.keycloak.provider.Provider; import org.keycloak.testsuite.domainextension.CompanyRepresentation; -import java.util.List; - public interface ExampleService extends Provider { List listCompanies(); diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/impl/ExampleServiceImpl.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/impl/ExampleServiceImpl.java index 1f5aeed721e..54d50e15620 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/impl/ExampleServiceImpl.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/spi/impl/ExampleServiceImpl.java @@ -17,6 +17,11 @@ package org.keycloak.testsuite.domainextension.spi.impl; +import java.util.LinkedList; +import java.util.List; + +import jakarta.persistence.EntityManager; + import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -25,10 +30,6 @@ import org.keycloak.testsuite.domainextension.CompanyRepresentation; import org.keycloak.testsuite.domainextension.jpa.Company; import org.keycloak.testsuite.domainextension.spi.ExampleService; -import jakarta.persistence.EntityManager; -import java.util.LinkedList; -import java.util.List; - public class ExampleServiceImpl implements ExampleService { private final KeycloakSession session; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/events/TestEventsListenerContextDetailsProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/events/TestEventsListenerContextDetailsProvider.java index e78911acdab..d64015d4a1b 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/events/TestEventsListenerContextDetailsProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/events/TestEventsListenerContextDetailsProvider.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.events; import java.util.HashMap; import java.util.Map; + import org.keycloak.events.Event; import org.keycloak.models.KeycloakSession; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/events/TestEventsListenerProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/events/TestEventsListenerProvider.java index 46d05582808..ad7b4f00186 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/events/TestEventsListenerProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/events/TestEventsListenerProvider.java @@ -17,15 +17,15 @@ package org.keycloak.testsuite.events; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingQueue; + import org.keycloak.events.Event; import org.keycloak.events.EventListenerProvider; import org.keycloak.events.EventListenerTransaction; import org.keycloak.events.admin.AdminEvent; import org.keycloak.models.KeycloakSession; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; - /** * @author Marko Strukelj */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java index 84625c75a36..bbfe07cc87f 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorage.java @@ -26,7 +26,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Stream; -import org.jboss.logging.Logger; import org.keycloak.common.util.Time; import org.keycloak.component.ComponentModel; import org.keycloak.credential.CredentialInput; @@ -55,6 +54,8 @@ import org.keycloak.storage.user.UserQueryProvider; import org.keycloak.storage.user.UserRegistrationProvider; import org.keycloak.util.JsonSerialization; +import org.jboss.logging.Logger; + /** * UserStorage implementation created in Keycloak 4.8.3. It is used for backwards compatibility testing. Future Keycloak versions * should work fine without a need to change the code of this provider. diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorageFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorageFactory.java index 2942be0585b..274ecdc08ab 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorageFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/BackwardsCompatibilityUserStorageFactory.java @@ -19,11 +19,11 @@ package org.keycloak.testsuite.federation; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.storage.UserStorageProviderFactory; -import java.util.concurrent.ConcurrentHashMap; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProvider.java index d6f17429c8f..4019144d986 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProvider.java @@ -17,6 +17,11 @@ package org.keycloak.testsuite.federation; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import org.keycloak.component.ComponentModel; import org.keycloak.credential.CredentialInput; import org.keycloak.credential.CredentialInputValidator; @@ -32,11 +37,6 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.user.UserLookupProvider; import org.keycloak.storage.user.UserRegistrationProvider; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - /** * @author Bill Burke * @version $Revision: 1 $ @@ -147,4 +147,3 @@ public class DummyUserFederationProvider implements UserStorageProvider, } } - diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProviderFactory.java index 0a672c1216c..7f32b9b6e72 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/DummyUserFederationProviderFactory.java @@ -17,7 +17,12 @@ package org.keycloak.testsuite.federation; -import org.jboss.logging.Logger; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + import org.keycloak.Config; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; @@ -30,11 +35,7 @@ import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.user.ImportSynchronization; import org.keycloak.storage.user.SynchronizationResult; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; +import org.jboss.logging.Logger; /** * @author Bill Burke diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailableHardcodedStorageProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailableHardcodedStorageProvider.java index 2a6df132d88..54499ee8f32 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailableHardcodedStorageProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailableHardcodedStorageProvider.java @@ -16,6 +16,10 @@ */ package org.keycloak.testsuite.federation; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.credential.CredentialInput; @@ -34,10 +38,6 @@ import org.keycloak.storage.user.ImportedUserValidation; import org.keycloak.storage.user.UserLookupProvider; import org.keycloak.storage.user.UserQueryProvider; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailableHardcodedStorageProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailableHardcodedStorageProviderFactory.java index ebc6c7953a9..738dc5d936a 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailableHardcodedStorageProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailableHardcodedStorageProviderFactory.java @@ -16,6 +16,10 @@ */ package org.keycloak.testsuite.federation; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; @@ -25,10 +29,6 @@ import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.user.ImportSynchronization; import org.keycloak.storage.user.SynchronizationResult; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailingUserStorageProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailingUserStorageProvider.java index b689083e62b..5e88daefd80 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailingUserStorageProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailingUserStorageProvider.java @@ -16,6 +16,9 @@ */ package org.keycloak.testsuite.federation; +import java.util.Map; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; @@ -25,9 +28,6 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.user.UserCountMethodsProvider; import org.keycloak.storage.user.UserQueryMethodsProvider; -import java.util.Map; -import java.util.stream.Stream; - /** * Test user storage provider that simulates various failure scenarios * to test graceful degradation in UserStorageManager. diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailingUserStorageProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailingUserStorageProviderFactory.java index 44774c5f425..5525ffc5e0e 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailingUserStorageProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/FailingUserStorageProviderFactory.java @@ -16,6 +16,8 @@ */ package org.keycloak.testsuite.federation; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; import org.keycloak.models.KeycloakSession; @@ -24,8 +26,6 @@ import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.storage.UserStorageProviderFactory; -import java.util.List; - /** * Factory for FailingUserStorageProvider - used in tests to simulate * user storage provider failures for graceful degradation testing. diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientScopeStorageProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientScopeStorageProvider.java index 6fbdf3774e3..86cbefca23d 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientScopeStorageProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientScopeStorageProvider.java @@ -19,6 +19,7 @@ package org.keycloak.testsuite.federation; import java.util.Collections; import java.util.Map; import java.util.stream.Stream; + import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.ProtocolMapperModel; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientScopeStorageProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientScopeStorageProviderFactory.java index be9f93b3df5..f2c0ee43d99 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientScopeStorageProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientScopeStorageProviderFactory.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.federation; import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientStorageProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientStorageProvider.java index 756423c2d48..1281cbd5dd6 100755 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientStorageProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientStorageProvider.java @@ -16,6 +16,15 @@ */ package org.keycloak.testsuite.federation; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; @@ -23,7 +32,6 @@ import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.utils.KeycloakModelUtils; - import org.keycloak.protocol.oidc.OIDCLoginProtocolFactory; import org.keycloak.storage.StorageId; import org.keycloak.storage.client.AbstractReadOnlyClientStorageAdapter; @@ -31,14 +39,6 @@ import org.keycloak.storage.client.ClientLookupProvider; import org.keycloak.storage.client.ClientStorageProvider; import org.keycloak.storage.client.ClientStorageProviderModel; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; import org.jboss.logging.Logger; /** diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientStorageProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientStorageProviderFactory.java index 3db8adbe1c8..c6d63d29a4e 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientStorageProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedClientStorageProviderFactory.java @@ -16,6 +16,8 @@ */ package org.keycloak.testsuite.federation; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; @@ -23,8 +25,6 @@ import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.storage.client.ClientStorageProviderFactory; import org.keycloak.storage.client.ClientStorageProviderModel; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedGroupStorageProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedGroupStorageProvider.java index 5de83ce3716..e265593240a 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedGroupStorageProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedGroupStorageProvider.java @@ -16,7 +16,10 @@ */ package org.keycloak.testsuite.federation; -import org.jboss.logging.Logger; +import java.util.List; +import java.util.Map; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.GroupModel; import org.keycloak.models.RealmModel; @@ -26,9 +29,7 @@ import org.keycloak.storage.StorageId; import org.keycloak.storage.group.GroupStorageProvider; import org.keycloak.storage.group.GroupStorageProviderModel; -import java.util.List; -import java.util.Map; -import java.util.stream.Stream; +import org.jboss.logging.Logger; public class HardcodedGroupStorageProvider implements GroupStorageProvider { private final GroupStorageProviderModel component; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedGroupStorageProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedGroupStorageProviderFactory.java index 599c795a31d..b09cec07906 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedGroupStorageProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedGroupStorageProviderFactory.java @@ -16,6 +16,8 @@ */ package org.keycloak.testsuite.federation; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; @@ -23,8 +25,6 @@ import org.keycloak.provider.ProviderConfigurationBuilder; import org.keycloak.storage.group.GroupStorageProviderFactory; import org.keycloak.storage.group.GroupStorageProviderModel; -import java.util.List; - public class HardcodedGroupStorageProviderFactory implements GroupStorageProviderFactory { @Override public HardcodedGroupStorageProvider create(KeycloakSession session, ComponentModel model) { diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedRoleStorageProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedRoleStorageProvider.java index 93b3cf5d7fd..fac9eb5d1e3 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedRoleStorageProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedRoleStorageProvider.java @@ -16,10 +16,10 @@ */ package org.keycloak.testsuite.federation; -import java.util.Map; import java.util.List; +import java.util.Map; import java.util.stream.Stream; -import org.jboss.logging.Logger; + import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleContainerModel; @@ -29,6 +29,8 @@ import org.keycloak.storage.StorageId; import org.keycloak.storage.role.RoleStorageProvider; import org.keycloak.storage.role.RoleStorageProviderModel; +import org.jboss.logging.Logger; + public class HardcodedRoleStorageProvider implements RoleStorageProvider { private final RoleStorageProviderModel component; private final String roleName; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedRoleStorageProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedRoleStorageProviderFactory.java index 59f3615e806..c93c30f7d12 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedRoleStorageProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/HardcodedRoleStorageProviderFactory.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.federation; import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.provider.ProviderConfigProperty; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/PassThroughFederatedUserStorageProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/PassThroughFederatedUserStorageProvider.java index 30582daa74d..debe2ff9fd0 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/PassThroughFederatedUserStorageProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/PassThroughFederatedUserStorageProvider.java @@ -16,6 +16,14 @@ */ package org.keycloak.testsuite.federation; +import java.util.Collections; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.credential.CredentialInput; import org.keycloak.credential.CredentialInputUpdater; @@ -31,14 +39,6 @@ import org.keycloak.storage.UserStorageUtil; import org.keycloak.storage.adapter.AbstractUserAdapterFederatedStorage; import org.keycloak.storage.user.UserLookupProvider; -import java.util.Collections; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.Stream; - /** * Provides one user where everything is stored in user federated storage * diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java index 8676a7cfaa9..34e4f9a7297 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorage.java @@ -16,7 +16,14 @@ */ package org.keycloak.testsuite.federation; -import org.jboss.logging.Logger; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ConcurrentSkipListSet; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.credential.CredentialInput; import org.keycloak.credential.CredentialInputUpdater; @@ -42,13 +49,7 @@ import org.keycloak.storage.user.UserLookupProvider; import org.keycloak.storage.user.UserQueryProvider; import org.keycloak.storage.user.UserRegistrationProvider; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ConcurrentSkipListSet; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Stream; +import org.jboss.logging.Logger; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; import static org.keycloak.utils.StreamsUtil.paginatedStream; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java index 6c9006ca3c1..c02e10f022f 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserMapStorageFactory.java @@ -17,6 +17,12 @@ package org.keycloak.testsuite.federation; import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + import org.keycloak.Config; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; @@ -24,12 +30,6 @@ import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.storage.UserStorageProviderFactory; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserPropertyFileStorage.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserPropertyFileStorage.java index 9e5e586ef3b..8c52b16aa5c 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserPropertyFileStorage.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserPropertyFileStorage.java @@ -16,6 +16,18 @@ */ package org.keycloak.testsuite.federation; +import java.io.Serializable; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Properties; +import java.util.Set; +import java.util.function.Predicate; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.credential.CredentialInput; import org.keycloak.credential.CredentialInputValidator; @@ -34,18 +46,6 @@ import org.keycloak.storage.adapter.AbstractUserAdapterFederatedStorage; import org.keycloak.storage.user.UserLookupProvider; import org.keycloak.storage.user.UserQueryProvider; -import java.io.Serializable; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Properties; -import java.util.Set; -import java.util.function.Predicate; -import java.util.stream.Stream; - import static org.keycloak.utils.StreamsUtil.paginatedStream; /** diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserPropertyFileStorageFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserPropertyFileStorageFactory.java index 7b3f375359f..bebd3d5ce51 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserPropertyFileStorageFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/UserPropertyFileStorageFactory.java @@ -18,25 +18,25 @@ package org.keycloak.testsuite.federation; import java.io.File; import java.io.FileInputStream; -import org.keycloak.Config; -import org.keycloak.component.ComponentModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.provider.ProviderConfigProperty; -import org.keycloak.storage.UserStorageProviderFactory; -import org.keycloak.storage.UserStorageProviderModel; -import org.keycloak.storage.user.ImportSynchronization; -import org.keycloak.storage.user.SynchronizationResult; - import java.io.IOException; import java.io.InputStream; import java.util.Date; import java.util.List; import java.util.Properties; + +import org.keycloak.Config; import org.keycloak.common.util.EnvUtil; +import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; +import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.provider.ProviderConfigurationBuilder; +import org.keycloak.storage.UserStorageProviderFactory; +import org.keycloak.storage.UserStorageProviderModel; +import org.keycloak.storage.user.ImportSynchronization; +import org.keycloak.storage.user.SynchronizationResult; /** * @author Bill Burke diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/sync/IgnoredDummyUserFederationProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/sync/IgnoredDummyUserFederationProviderFactory.java index 0f38e4866de..8da869925c1 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/sync/IgnoredDummyUserFederationProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/sync/IgnoredDummyUserFederationProviderFactory.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.federation.sync; import java.util.Date; + import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.user.SynchronizationResult; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/sync/SyncDummyUserFederationProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/sync/SyncDummyUserFederationProviderFactory.java index 8da5a958a5e..f970582711a 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/sync/SyncDummyUserFederationProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/federation/sync/SyncDummyUserFederationProviderFactory.java @@ -17,7 +17,11 @@ package org.keycloak.testsuite.federation.sync; -import org.jboss.logging.Logger; +import java.util.Date; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.KeycloakSessionTask; @@ -31,10 +35,7 @@ import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.user.SynchronizationResult; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; -import java.util.Date; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ClickThroughAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ClickThroughAuthenticator.java index 4d8003a9dde..c763c3ad43b 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ClickThroughAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ClickThroughAuthenticator.java @@ -17,6 +17,10 @@ package org.keycloak.testsuite.forms; +import java.util.List; + +import jakarta.ws.rs.core.Response; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; @@ -28,9 +32,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; -import jakarta.ws.rs.core.Response; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/DummyClientAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/DummyClientAuthenticator.java index 6f695dbddea..352e7157326 100755 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/DummyClientAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/DummyClientAuthenticator.java @@ -17,6 +17,12 @@ package org.keycloak.testsuite.forms; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.keycloak.authentication.AuthenticationFlowError; import org.keycloak.authentication.ClientAuthenticationFlowContext; import org.keycloak.authentication.FlowStatus; @@ -26,12 +32,6 @@ import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.ClientModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ErrorEventAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ErrorEventAuthenticator.java index e5f42ee79a5..ef0cf4723f9 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ErrorEventAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/ErrorEventAuthenticator.java @@ -17,6 +17,8 @@ package org.keycloak.testsuite.forms; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; @@ -28,8 +30,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - public class ErrorEventAuthenticator implements Authenticator, AuthenticatorFactory { public static final String PROVIDER_ID = "test-suite-fire-error-event"; public static final String ERROR_MESSAGE = "fire-error-event"; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughAuthenticator.java index 930cb6aa552..1f685871fff 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughAuthenticator.java @@ -17,6 +17,8 @@ package org.keycloak.testsuite.forms; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; @@ -30,8 +32,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughClientAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughClientAuthenticator.java index 416879d0a8e..4bead277d99 100755 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughClientAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughClientAuthenticator.java @@ -17,13 +17,6 @@ package org.keycloak.testsuite.forms; -import org.keycloak.authentication.AuthenticationFlowError; -import org.keycloak.authentication.ClientAuthenticationFlowContext; -import org.keycloak.authentication.authenticators.client.AbstractClientAuthenticator; -import org.keycloak.models.AuthenticationExecutionModel; -import org.keycloak.models.ClientModel; -import org.keycloak.provider.ProviderConfigProperty; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -32,6 +25,13 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.keycloak.authentication.AuthenticationFlowError; +import org.keycloak.authentication.ClientAuthenticationFlowContext; +import org.keycloak.authentication.authenticators.client.AbstractClientAuthenticator; +import org.keycloak.models.AuthenticationExecutionModel; +import org.keycloak.models.ClientModel; +import org.keycloak.provider.ProviderConfigProperty; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughRegistration.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughRegistration.java index d03c0b004bf..567c4e0333a 100755 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughRegistration.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/PassThroughRegistration.java @@ -17,6 +17,8 @@ package org.keycloak.testsuite.forms; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; @@ -31,8 +33,6 @@ import org.keycloak.models.UserModel; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/SetClientNoteAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/SetClientNoteAuthenticator.java index c81d2381e8e..0dab1dae1be 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/SetClientNoteAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/SetClientNoteAuthenticator.java @@ -22,7 +22,6 @@ import java.util.List; import jakarta.ws.rs.core.MultivaluedMap; -import org.jboss.logging.Logger; import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.Authenticator; @@ -35,6 +34,8 @@ import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderConfigProperty; import org.keycloak.sessions.AuthenticationSessionModel; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/UsernameOnlyAuthenticator.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/UsernameOnlyAuthenticator.java index 1fd72f4def4..256e99b1303 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/UsernameOnlyAuthenticator.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/forms/UsernameOnlyAuthenticator.java @@ -17,6 +17,8 @@ package org.keycloak.testsuite.forms; +import java.util.List; + import org.keycloak.Config; import org.keycloak.authentication.AuthenticationFlowContext; import org.keycloak.authentication.AuthenticationFlowError; @@ -30,8 +32,6 @@ import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.ProviderConfigProperty; -import java.util.List; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/model/infinispan/InfinispanTestUtil.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/model/infinispan/InfinispanTestUtil.java index 87fef329de4..22ddc06fb35 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/model/infinispan/InfinispanTestUtil.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/model/infinispan/InfinispanTestUtil.java @@ -18,11 +18,12 @@ package org.keycloak.testsuite.model.infinispan; -import org.infinispan.manager.EmbeddedCacheManager; -import org.jboss.logging.Logger; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.models.KeycloakSession; +import org.infinispan.manager.EmbeddedCacheManager; +import org.jboss.logging.Logger; + import static org.keycloak.connections.infinispan.InfinispanUtil.setTimeServiceToKeycloakTime; /** diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/model/infinispan/InfinispanTimeServiceTask.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/model/infinispan/InfinispanTimeServiceTask.java index 2f3f3c74592..cfd01d7ab8c 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/model/infinispan/InfinispanTimeServiceTask.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/model/infinispan/InfinispanTimeServiceTask.java @@ -17,6 +17,12 @@ package org.keycloak.testsuite.model.infinispan; +import java.time.Instant; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + import org.infinispan.commons.logging.Log; import org.infinispan.commons.logging.LogFactory; import org.infinispan.commons.time.TimeService; @@ -29,12 +35,6 @@ import org.infinispan.tasks.TaskContext; import org.infinispan.tasks.TaskExecutionMode; import org.infinispan.util.EmbeddedTimeService; -import java.time.Instant; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.TimeUnit; - public class InfinispanTimeServiceTask implements ServerTask { private static final Log log = LogFactory.getLog(InfinispanTimeServiceTask.class); diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java index c52b047c08d..a6cd61a319c 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java @@ -17,10 +17,24 @@ package org.keycloak.testsuite.rest; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.http.HttpRequest; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.TimeUnit; + +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.OAuth2Constants; import org.keycloak.common.util.HtmlUtils; +import org.keycloak.http.HttpRequest; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; import org.keycloak.models.KeycloakSession; @@ -35,19 +49,7 @@ import org.keycloak.testsuite.rest.representation.TestAuthenticationChannelReque import org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResource; import org.keycloak.utils.MediaType; -import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.TimeUnit; +import org.jboss.resteasy.reactive.NoCache; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProviderFactory.java index a1a8db9c085..7159a17a751 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProviderFactory.java @@ -17,6 +17,14 @@ package org.keycloak.testsuite.rest; +import java.security.KeyPair; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.LinkedBlockingDeque; + import org.keycloak.Config.Scope; import org.keycloak.crypto.KeyType; import org.keycloak.crypto.KeyUse; @@ -31,14 +39,6 @@ import org.keycloak.services.resource.RealmResourceProvider; import org.keycloak.services.resource.RealmResourceProviderFactory; import org.keycloak.testsuite.rest.representation.TestAuthenticationChannelRequest; -import java.security.KeyPair; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.LinkedBlockingDeque; - /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProvider.java index c2bb73da1d0..3c3de737501 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProvider.java @@ -17,16 +17,8 @@ package org.keycloak.testsuite.rest; -import org.keycloak.http.HttpRequest; -import org.keycloak.jose.jws.JWSInput; -import org.keycloak.jose.jws.JWSInputException; -import org.keycloak.models.KeycloakSession; -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.resource.RealmResourceProvider; -import org.keycloak.services.resources.RealmsResource; -import org.keycloak.utils.MediaType; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.TimeUnit; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -37,8 +29,17 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.TimeUnit; + +import org.keycloak.http.HttpRequest; +import org.keycloak.jose.jws.JWSInput; +import org.keycloak.jose.jws.JWSInputException; +import org.keycloak.models.KeycloakSession; +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.resource.RealmResourceProvider; +import org.keycloak.services.resources.RealmsResource; +import org.keycloak.utils.MediaType; /** * Copied from {@link TestApplicationResourceProvider} diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProviderFactory.java index 5851695e457..427596c4155 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestSamlApplicationResourceProviderFactory.java @@ -17,6 +17,9 @@ package org.keycloak.testsuite.rest; +import java.util.concurrent.BlockingQueue; +import java.util.concurrent.LinkedBlockingDeque; + import org.keycloak.Config.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; @@ -26,9 +29,6 @@ import org.keycloak.representations.adapters.action.TestAvailabilityAction; import org.keycloak.services.resource.RealmResourceProvider; import org.keycloak.services.resource.RealmResourceProviderFactory; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingDeque; - /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java index 29ccfaeb7d6..233a59d7459 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java @@ -17,6 +17,27 @@ package org.keycloak.testsuite.rest; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.UUID; +import java.util.function.Consumer; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -29,7 +50,7 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.CacheControl; import jakarta.ws.rs.core.Response; -import org.jboss.resteasy.reactive.NoCache; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.common.Profile.Feature; @@ -103,26 +124,7 @@ import org.keycloak.truststore.TruststoreProvider; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.MediaType; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.UUID; -import java.util.function.Consumer; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.resteasy.reactive.NoCache; import static java.util.Objects.requireNonNull; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestCacheResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestCacheResource.java index ddcf4b2c088..7ddf2553626 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestCacheResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestCacheResource.java @@ -17,22 +17,24 @@ package org.keycloak.testsuite.rest.resource; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; -import org.infinispan.Cache; -import org.infinispan.stream.CacheCollectors; + import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.utils.MediaType; -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; +import org.infinispan.Cache; +import org.infinispan.stream.CacheCollectors; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingExportImportResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingExportImportResource.java index 60e78efc70f..2c0adb717dd 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingExportImportResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingExportImportResource.java @@ -17,8 +17,7 @@ package org.keycloak.testsuite.rest.resource; -import org.keycloak.exportimport.ExportImportManager; -import org.keycloak.models.KeycloakSession; +import java.nio.file.Files; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -28,7 +27,10 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.nio.file.Files; + +import org.keycloak.exportimport.ExportImportManager; +import org.keycloak.exportimport.Strategy; +import org.keycloak.models.KeycloakSession; import static org.keycloak.exportimport.ExportImportConfig.ACTION; import static org.keycloak.exportimport.ExportImportConfig.DEFAULT_USERS_PER_FILE; @@ -38,7 +40,6 @@ import static org.keycloak.exportimport.ExportImportConfig.PROVIDER; import static org.keycloak.exportimport.ExportImportConfig.REALM_NAME; import static org.keycloak.exportimport.ExportImportConfig.STRATEGY; import static org.keycloak.exportimport.ExportImportConfig.USERS_PER_FILE; -import org.keycloak.exportimport.Strategy; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java index 4f7e884d881..b497e68f812 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java @@ -17,12 +17,37 @@ package org.keycloak.testsuite.rest.resource; -import org.jboss.resteasy.reactive.NoCache; - +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.security.InvalidAlgorithmParameterException; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.SecureRandom; +import java.security.spec.ECGenParameterSpec; +import java.util.ArrayList; +import java.util.Base64; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentMap; +import java.util.stream.Stream; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; @@ -48,10 +73,10 @@ import org.keycloak.jose.jws.JWSBuilder; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; import org.keycloak.models.Constants; +import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.grants.ciba.CibaGrantType; import org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelRequest; import org.keycloak.protocol.oidc.grants.ciba.channel.HttpAuthenticationChannelProvider; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.grants.ciba.endpoints.ClientNotificationEndpointRequest; import org.keycloak.representations.AccessToken; import org.keycloak.representations.JsonWebToken; @@ -63,34 +88,7 @@ import org.keycloak.testsuite.rest.representation.TestAuthenticationChannelReque import org.keycloak.util.JsonSerialization; import com.fasterxml.jackson.annotation.JsonProperty; - -import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Context; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; - -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.security.InvalidAlgorithmParameterException; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; -import java.security.PrivateKey; -import java.security.SecureRandom; -import java.security.spec.ECGenParameterSpec; -import java.util.ArrayList; -import java.util.Base64; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentMap; -import java.util.stream.Stream; +import org.jboss.resteasy.reactive.NoCache; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/FetchOnServer.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/FetchOnServer.java index 4aea4fd4c2c..b29ecf34e3e 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/FetchOnServer.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/FetchOnServer.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.runonserver; -import org.keycloak.models.KeycloakSession; - import java.io.Serializable; +import org.keycloak.models.KeycloakSession; + /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/RunHelpers.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/RunHelpers.java index b00620037cc..ae840ef023f 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/RunHelpers.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/RunHelpers.java @@ -1,5 +1,8 @@ package org.keycloak.testsuite.runonserver; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.credential.CredentialModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -8,9 +11,6 @@ import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.List; -import java.util.stream.Collectors; - /** * Created by st on 26.01.17. */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/RunOnServer.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/RunOnServer.java index 3edb85e7883..5acdc812fc5 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/RunOnServer.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/runonserver/RunOnServer.java @@ -17,12 +17,12 @@ package org.keycloak.testsuite.runonserver; -import org.keycloak.common.VerificationException; -import org.keycloak.models.KeycloakSession; - import java.io.IOException; import java.io.Serializable; +import org.keycloak.common.VerificationException; +import org.keycloak.models.KeycloakSession; + /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/condition/TestRaiseExceptionCondition.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/condition/TestRaiseExceptionCondition.java index 50383c87969..4ec79ecbeba 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/condition/TestRaiseExceptionCondition.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/condition/TestRaiseExceptionCondition.java @@ -19,11 +19,11 @@ package org.keycloak.testsuite.services.clientpolicy.condition; import org.keycloak.OAuthErrorException; import org.keycloak.models.KeycloakSession; +import org.keycloak.representations.idm.ClientPolicyConditionConfigurationRepresentation; import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.ClientPolicyVote; import org.keycloak.services.clientpolicy.condition.AbstractClientPolicyConditionProvider; -import org.keycloak.representations.idm.ClientPolicyConditionConfigurationRepresentation; /** * @author Takashi Norimatsu diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestEnhancedPluggableTokenManagerExecutor.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestEnhancedPluggableTokenManagerExecutor.java index d1f3f1f149f..77b3419deb6 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestEnhancedPluggableTokenManagerExecutor.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestEnhancedPluggableTokenManagerExecutor.java @@ -17,7 +17,6 @@ package org.keycloak.testsuite.services.clientpolicy.executor; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; import org.keycloak.protocol.oidc.TokenManager; import org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation; @@ -27,6 +26,8 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.context.TokenResponseContext; import org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProvider; +import org.jboss.logging.Logger; + /** * @author Takashi Norimatsu */ diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestRaiseExceptionExecutor.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestRaiseExceptionExecutor.java index 4b54d4a58a3..242ac2ac758 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestRaiseExceptionExecutor.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/services/clientpolicy/executor/TestRaiseExceptionExecutor.java @@ -19,14 +19,15 @@ package org.keycloak.testsuite.services.clientpolicy.executor; import java.util.List; -import org.jboss.logging.Logger; import org.keycloak.models.KeycloakSession; +import org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation; import org.keycloak.services.clientpolicy.ClientPolicyContext; import org.keycloak.services.clientpolicy.ClientPolicyEvent; import org.keycloak.services.clientpolicy.ClientPolicyException; -import org.keycloak.representations.idm.ClientPolicyExecutorConfigurationRepresentation; import org.keycloak.services.clientpolicy.executor.ClientPolicyExecutorProvider; +import org.jboss.logging.Logger; + public class TestRaiseExceptionExecutor implements ClientPolicyExecutorProvider { private static final Logger logger = Logger.getLogger(TestRaiseExceptionExecutor.class); diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderFactory.java index cf42f89ce43..246b459c4ea 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderFactory.java @@ -4,13 +4,15 @@ import jakarta.ws.rs.GET; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.jboss.resteasy.reactive.NoCache; + import org.keycloak.Config.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.services.resource.AccountResourceProvider; import org.keycloak.services.resource.AccountResourceProviderFactory; +import org.jboss.resteasy.reactive.NoCache; + public class CustomAccountResourceProviderFactory implements AccountResourceProviderFactory, AccountResourceProvider { public static final String ID = "ext-custom-account-console"; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/user/profile/CustomUserProfileProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/user/profile/CustomUserProfileProvider.java index fb4912391cf..02132600645 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/user/profile/CustomUserProfileProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/user/profile/CustomUserProfileProvider.java @@ -1,5 +1,7 @@ package org.keycloak.testsuite.user.profile; +import java.util.Map; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; import org.keycloak.representations.userprofile.config.UPConfig; @@ -7,8 +9,6 @@ import org.keycloak.userprofile.DeclarativeUserProfileProvider; import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileContext; -import java.util.Map; - public class CustomUserProfileProvider extends DeclarativeUserProfileProvider { public CustomUserProfileProvider(KeycloakSession session, CustomUserProfileProviderFactory factory) { diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/FeatureDeployerUtil.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/FeatureDeployerUtil.java index 02468f74b61..45badf04457 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/FeatureDeployerUtil.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/FeatureDeployerUtil.java @@ -18,7 +18,14 @@ package org.keycloak.testsuite.util; -import org.jboss.logging.Logger; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; + import org.keycloak.Config; import org.keycloak.common.Profile; import org.keycloak.provider.DefaultProviderLoader; @@ -30,13 +37,7 @@ import org.keycloak.provider.ProviderManagerRegistry; import org.keycloak.provider.Spi; import org.keycloak.services.DefaultKeycloakSession; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.stream.Collectors; +import org.jboss.logging.Logger; /** * Used to dynamically reload EnvironmentDependentProviderFactories after some feature is enabled/disabled diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/LDAPTestUtils.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/LDAPTestUtils.java index 76960895360..323810fab34 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/LDAPTestUtils.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/util/LDAPTestUtils.java @@ -17,6 +17,15 @@ package org.keycloak.testsuite.util; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Consumer; +import java.util.stream.Stream; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; @@ -29,8 +38,8 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.models.utils.UserModelDelegate; import org.keycloak.storage.UserStoragePrivateUtil; import org.keycloak.storage.UserStorageProvider; -import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.LDAPConfig; +import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.LDAPStorageProviderFactory; import org.keycloak.storage.ldap.LDAPUtils; import org.keycloak.storage.ldap.idm.model.LDAPDn; @@ -52,15 +61,6 @@ import org.keycloak.storage.ldap.mappers.membership.role.RoleLDAPStorageMapper; import org.keycloak.storage.ldap.mappers.membership.role.RoleLDAPStorageMapperFactory; import org.keycloak.storage.ldap.mappers.membership.role.RoleMapperConfig; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Consumer; -import java.util.stream.Stream; - /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertow.java b/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertow.java index ac0bc853949..9ea63ed8e42 100644 --- a/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertow.java +++ b/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertow.java @@ -17,7 +17,26 @@ package org.keycloak.testsuite.arquillian.undertow; -import static org.keycloak.testsuite.KeycloakServer.registerScriptProviders; +import java.lang.reflect.Field; +import java.util.Collection; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; +import jakarta.servlet.ServletException; + +import org.keycloak.common.util.reflections.Reflections; +import org.keycloak.models.KeycloakSession; +import org.keycloak.services.DefaultKeycloakSessionFactory; +import org.keycloak.services.managers.ApplianceBootstrap; +import org.keycloak.services.resources.KeycloakApplication; +import org.keycloak.services.resteasy.ResteasyKeycloakApplication; +import org.keycloak.testsuite.KeycloakServer; +import org.keycloak.testsuite.UndertowRequestFilter; +import org.keycloak.testsuite.utils.tls.TLSUtils; +import org.keycloak.testsuite.utils.undertow.UndertowDeployerHelper; +import org.keycloak.testsuite.utils.undertow.UndertowWarClassLoader; import io.undertow.Undertow; import io.undertow.server.HttpHandler; @@ -28,6 +47,7 @@ import io.undertow.servlet.api.DefaultServletConfig; import io.undertow.servlet.api.DeploymentInfo; import io.undertow.servlet.api.DeploymentManager; import io.undertow.servlet.api.FilterInfo; +import io.undertow.servlet.api.InstanceHandle; import io.undertow.servlet.api.ServletContainer; import io.undertow.servlet.api.ServletInfo; import org.jboss.arquillian.container.spi.client.container.DeployableContainer; @@ -46,29 +66,11 @@ import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.descriptor.api.Descriptor; import org.jboss.shrinkwrap.undertow.api.UndertowWebArchive; -import org.keycloak.common.util.reflections.Reflections; -import org.keycloak.models.KeycloakSession; -import org.keycloak.services.DefaultKeycloakSessionFactory; -import org.keycloak.services.managers.ApplianceBootstrap; -import org.keycloak.services.resources.KeycloakApplication; -import org.keycloak.services.resteasy.ResteasyKeycloakApplication; -import org.keycloak.testsuite.KeycloakServer; -import org.keycloak.testsuite.UndertowRequestFilter; -import org.keycloak.testsuite.utils.tls.TLSUtils; -import org.keycloak.testsuite.utils.undertow.UndertowDeployerHelper; -import org.keycloak.testsuite.utils.undertow.UndertowWarClassLoader; - -import io.undertow.servlet.api.InstanceHandle; -import jakarta.servlet.DispatcherType; -import jakarta.servlet.ServletException; -import java.lang.reflect.Field; -import java.util.Collection; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import jakarta.servlet.Filter; import org.xnio.Options; import org.xnio.SslClientAuthMode; +import static org.keycloak.testsuite.KeycloakServer.registerScriptProviders; + public class KeycloakOnUndertow implements DeployableContainer { protected final Logger log = Logger.getLogger(this.getClass()); diff --git a/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertowArquillianExtension.java b/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertowArquillianExtension.java index 79666047a48..6d3c4f95256 100644 --- a/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertowArquillianExtension.java +++ b/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/KeycloakOnUndertowArquillianExtension.java @@ -1,8 +1,9 @@ package org.keycloak.testsuite.arquillian.undertow; +import org.keycloak.testsuite.arquillian.undertow.lb.SimpleUndertowLoadBalancerContainer; + import org.jboss.arquillian.container.spi.client.container.DeployableContainer; import org.jboss.arquillian.core.spi.LoadableExtension; -import org.keycloak.testsuite.arquillian.undertow.lb.SimpleUndertowLoadBalancerContainer; /** * diff --git a/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/lb/SimpleUndertowLoadBalancer.java b/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/lb/SimpleUndertowLoadBalancer.java index 90138284514..9a5ef1af6ae 100644 --- a/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/lb/SimpleUndertowLoadBalancer.java +++ b/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/lb/SimpleUndertowLoadBalancer.java @@ -21,11 +21,18 @@ import java.lang.reflect.Field; import java.net.URI; import java.security.GeneralSecurityException; import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.StringTokenizer; import java.util.concurrent.TimeUnit; +import org.keycloak.common.util.reflections.Reflections; +import org.keycloak.cookie.CookieType; +import org.keycloak.testsuite.utils.tls.TLSUtils; + import io.undertow.Undertow; import io.undertow.server.HttpHandler; import io.undertow.server.HttpServerExchange; @@ -36,22 +43,14 @@ import io.undertow.server.handlers.proxy.ProxyCallback; import io.undertow.server.handlers.proxy.ProxyClient; import io.undertow.server.handlers.proxy.ProxyConnection; import io.undertow.server.handlers.proxy.ProxyHandler; -import io.undertow.util.AttachmentKey; -import io.undertow.util.Headers; -import org.jboss.logging.Logger; -import org.keycloak.common.util.reflections.Reflections; -import org.keycloak.cookie.CookieType; -import org.keycloak.testsuite.utils.tls.TLSUtils; - import io.undertow.server.handlers.proxy.RouteIteratorFactory; import io.undertow.server.handlers.proxy.RouteIteratorFactory.ParsingCompatibility; import io.undertow.server.handlers.proxy.RouteParsingStrategy; +import io.undertow.util.AttachmentKey; +import io.undertow.util.Headers; +import org.jboss.logging.Logger; import org.xnio.OptionMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.StringTokenizer; - /** * Loadbalancer on embedded undertow. Supports sticky session over "AUTH_SESSION_ID" cookie and failover to different node when sticky node not available. * Status 503 is returned just if all backend nodes are unavailable. diff --git a/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/lb/SimpleUndertowLoadBalancerContainer.java b/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/lb/SimpleUndertowLoadBalancerContainer.java index 85cd2cf396f..f864f9d8346 100644 --- a/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/lb/SimpleUndertowLoadBalancerContainer.java +++ b/testsuite/integration-arquillian/servers/auth-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/lb/SimpleUndertowLoadBalancerContainer.java @@ -17,6 +17,8 @@ package org.keycloak.testsuite.arquillian.undertow.lb; +import org.keycloak.testsuite.arquillian.LoadBalancerController; + import org.jboss.arquillian.container.spi.client.container.DeployableContainer; import org.jboss.arquillian.container.spi.client.container.DeploymentException; import org.jboss.arquillian.container.spi.client.container.LifecycleException; @@ -25,7 +27,6 @@ import org.jboss.arquillian.container.spi.client.protocol.metadata.ProtocolMetaD import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.descriptor.api.Descriptor; -import org.keycloak.testsuite.arquillian.LoadBalancerController; /** * Arquillian container over {@link SimpleUndertowLoadBalancer} diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java index bdb3506741a..764689285a4 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/filter/AdapterActionsFilter.java @@ -18,8 +18,8 @@ package org.keycloak.testsuite.adapter.filter; -import org.jboss.logging.Logger; -import org.keycloak.common.util.Time; +import java.io.IOException; +import java.io.PrintWriter; import jakarta.servlet.Filter; import jakarta.servlet.FilterChain; @@ -29,8 +29,10 @@ import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; + +import org.keycloak.common.util.Time; + +import org.jboss.logging.Logger; /** * Filter to handle "special" requests to perform actions on adapter side (for example setting time offset ) diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java index c7d7a309bff..2b3f7ac3ca4 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/ErrorServlet.java @@ -17,12 +17,14 @@ package org.keycloak.testsuite.adapter.servlet; +import java.io.IOException; +import java.io.PrintWriter; + import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; + import org.keycloak.adapters.spi.AuthenticationError; /** diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java index f154ee4492d..28592496538 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/InputServlet.java @@ -17,15 +17,16 @@ package org.keycloak.testsuite.adapter.servlet; -import org.junit.Assert; +import java.io.IOException; +import java.io.PrintWriter; import jakarta.servlet.ServletException; import jakarta.servlet.annotation.WebServlet; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.io.PrintWriter; + +import org.junit.Assert; /** * @author Bill Burke diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlMultiTenantResolver.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlMultiTenantResolver.java index 47cc83c55d2..24fa578d37f 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlMultiTenantResolver.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlMultiTenantResolver.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.adapter.servlet; import java.io.InputStream; + import org.keycloak.adapters.saml.SamlConfigResolver; import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.adapters.saml.config.parsers.DeploymentBuilder; diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java index 734785190d3..1f1e6af6151 100755 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SamlSPFacade.java @@ -17,6 +17,17 @@ package org.keycloak.testsuite.adapter.servlet; +import java.io.IOException; +import java.io.PrintWriter; +import java.net.URI; +import java.util.UUID; + +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.saml.BaseSAML2BindingBuilder; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; @@ -24,15 +35,6 @@ 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.processing.api.saml.v2.request.SAML2Request; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.ws.rs.core.UriBuilder; -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URI; -import java.util.UUID; /** * @author Bill Burke diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java index 6b9f998a898..71dfe881a23 100755 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java @@ -18,11 +18,19 @@ package org.keycloak.testsuite.adapter.servlet; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.adapters.saml.SamlAuthenticationError; -import org.keycloak.adapters.saml.SamlPrincipal; -import org.keycloak.adapters.saml.SamlSession; -import org.keycloak.adapters.spi.AuthenticationError; +import java.io.IOException; +import java.io.StringWriter; +import java.security.Principal; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map.Entry; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; import jakarta.servlet.RequestDispatcher; import jakarta.servlet.http.HttpServletRequest; @@ -36,19 +44,13 @@ import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import javax.xml.datatype.XMLGregorianCalendar; -import java.io.IOException; -import java.io.StringWriter; -import java.security.Principal; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map.Entry; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; + +import org.keycloak.adapters.saml.SamlAuthenticationError; +import org.keycloak.adapters.saml.SamlPrincipal; +import org.keycloak.adapters.saml.SamlSession; +import org.keycloak.adapters.spi.AuthenticationError; + +import org.jboss.resteasy.reactive.NoCache; import org.w3c.dom.Document; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/ProfileAssume.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/ProfileAssume.java index cf7aa0ba57c..5bc67cf9eb6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/ProfileAssume.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/ProfileAssume.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite; -import org.junit.Assume; +import java.util.Set; + import org.keycloak.common.Profile; import org.keycloak.testsuite.arquillian.TestContext; -import java.util.Set; +import org.junit.Assume; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/account/AccountRestClient.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/account/AccountRestClient.java index 7bf600ceb8b..54784a8b9c7 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/account/AccountRestClient.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/account/AccountRestClient.java @@ -23,9 +23,6 @@ import java.io.IOException; import java.util.List; import java.util.function.Supplier; -import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; import org.keycloak.http.simple.SimpleHttpResponse; import org.keycloak.representations.account.CredentialMetadataRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; @@ -34,6 +31,10 @@ import org.keycloak.testsuite.arquillian.SuiteContext; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.util.TokenUtil; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; + /** * Helper client for account REST API * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/AdapterLogoutPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/AdapterLogoutPage.java index baac09a9507..5373c2a7a92 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/AdapterLogoutPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/AdapterLogoutPage.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; - -import java.net.URL; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/AppServerContextRoot.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/AppServerContextRoot.java index fdcdf559416..5a16b86c838 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/AppServerContextRoot.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/AppServerContextRoot.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.adapter.page; -import org.jboss.arquillian.test.api.ArquillianResource; +import java.net.URL; + import org.keycloak.testsuite.arquillian.annotation.AppServerBrowserContext; import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl; -import java.net.URL; +import org.jboss.arquillian.test.api.ArquillianResource; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadAssertionSalesPostSig.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadAssertionSalesPostSig.java index 8d10b22a04d..76347e1db1a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadAssertionSalesPostSig.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadAssertionSalesPostSig.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadClientSalesPostSigServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadClientSalesPostSigServlet.java index 163d3f1009b..39371762448 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadClientSalesPostSigServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadClientSalesPostSigServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadRealmSalesPostSigServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadRealmSalesPostSigServlet.java index f4dcc0c9c58..b6ae6f5b86d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadRealmSalesPostSigServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/BadRealmSalesPostSigServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/DifferentCookieNameServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/DifferentCookieNameServlet.java index 5594b9665f7..2e4458a11af 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/DifferentCookieNameServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/DifferentCookieNameServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EcpSP.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EcpSP.java index 41600143dae..dacaa49b7e8 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EcpSP.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EcpSP.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/Employee2Servlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/Employee2Servlet.java index 4257c2febff..2c40b8f0d7a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/Employee2Servlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/Employee2Servlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeAcsServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeAcsServlet.java index a1da272a61c..953a44b7503 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeAcsServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeAcsServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeDomServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeDomServlet.java index f690ddf39b9..3d6a1131fdc 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeDomServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeDomServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author rmartinc */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeRoleMappingServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeRoleMappingServlet.java index f8909d7e499..143d987f7ad 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeRoleMappingServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeRoleMappingServlet.java @@ -19,11 +19,12 @@ package org.keycloak.testsuite.adapter.page; import java.net.URL; -import org.jboss.arquillian.container.test.api.OperateOnDeployment; -import org.jboss.arquillian.test.api.ArquillianResource; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.auth.page.login.SAMLPostLogin; import org.keycloak.testsuite.util.WaitUtils; + +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.test.api.ArquillianResource; import org.openqa.selenium.By; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeServlet.java index c8a0d662a44..b562c2bab6c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeServletDistributable.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeServletDistributable.java index ed547c09bac..84f14d51bf5 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeServletDistributable.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeServletDistributable.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; - -import java.net.URL; import org.openqa.selenium.WebDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigFrontServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigFrontServlet.java index 0e7886cd046..2520354f312 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigFrontServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigFrontServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigPostNoIdpKeyServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigPostNoIdpKeyServlet.java index 5ef40ae77df..bf2bb2164ba 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigPostNoIdpKeyServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigPostNoIdpKeyServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author hmlnarik */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigRedirNoIdpKeyServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigRedirNoIdpKeyServlet.java index ac6d67184d3..b56802400e6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigRedirNoIdpKeyServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigRedirNoIdpKeyServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author hmlnarik */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigRedirOptNoIdpKeyServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigRedirOptNoIdpKeyServlet.java index e37c12f6902..c7876f852fc 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigRedirOptNoIdpKeyServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigRedirOptNoIdpKeyServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author hmlnarik */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigServlet.java index 910ef46d173..79c7e361068 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/EmployeeSigServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/InputPortal.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/InputPortal.java index 7edc5c5bc89..5bbfe59e4b2 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/InputPortal.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/InputPortal.java @@ -17,13 +17,13 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import java.net.URL; - /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MissingAssertionSig.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MissingAssertionSig.java index 78ff38c10a9..f1acc44b716 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MissingAssertionSig.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MissingAssertionSig.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant1Saml.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant1Saml.java index fd339769fa3..f1a870d67ae 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant1Saml.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant1Saml.java @@ -18,10 +18,11 @@ package org.keycloak.testsuite.adapter.page; import java.net.MalformedURLException; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; import static org.keycloak.testsuite.util.WaitUtils.pause; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant2Saml.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant2Saml.java index fa9a22aab24..d5fc9f62dec 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant2Saml.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/MultiTenant2Saml.java @@ -18,10 +18,11 @@ package org.keycloak.testsuite.adapter.page; import java.net.MalformedURLException; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; import static org.keycloak.testsuite.util.WaitUtils.pause; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServlet.java index ce8d47497ca..00aeca61fb2 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SAMLServlet.java @@ -25,13 +25,14 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl; import org.keycloak.testsuite.util.WaitUtils; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; - import org.openqa.selenium.By; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; + /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesMetadataServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesMetadataServlet.java index 93f2043a9ef..6dcf9457181 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesMetadataServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesMetadataServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPost2Servlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPost2Servlet.java index d821d868d66..a6396f94e97 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPost2Servlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPost2Servlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostAssertionAndResponseSig.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostAssertionAndResponseSig.java index a4522b4b2d0..4dec4499216 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostAssertionAndResponseSig.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostAssertionAndResponseSig.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostAutodetectServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostAutodetectServlet.java index 9e7e3b7ac63..f03b22b6a6c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostAutodetectServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostAutodetectServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostClockSkewServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostClockSkewServlet.java index 9fd3d22261a..2c04b8ea2f4 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostClockSkewServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostClockSkewServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - public class SalesPostClockSkewServlet extends SAMLServlet { public static final String DEPLOYMENT_NAME = "sales-post-clock-skew"; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostEncServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostEncServlet.java index 43ddeae743f..7b56901fe55 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostEncServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostEncServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostEncSignAssertionsOnlyServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostEncSignAssertionsOnlyServlet.java index 1e54d562ddc..c313df19383 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostEncSignAssertionsOnlyServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostEncSignAssertionsOnlyServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostPassiveServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostPassiveServlet.java index a5879c0c3d7..235a64dbed2 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostPassiveServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostPassiveServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostServlet.java index c2a4d662c06..6403a9a91f6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigEmailServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigEmailServlet.java index 77c68f10cbd..8e50bf68a89 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigEmailServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigEmailServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigPersistentServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigPersistentServlet.java index 5ccb96f90d6..ad662f048d4 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigPersistentServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigPersistentServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigServlet.java index b4ab9bb5805..530e92c29ec 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigTransientServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigTransientServlet.java index 697ac83e0bf..19a088c1647 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigTransientServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/adapter/page/SalesPostSigTransientServlet.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.adapter.page; +import java.net.URL; + import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.test.api.ArquillianResource; -import java.net.URL; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java index e4493b16cb6..ca5fdf002ad 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/ApiUtil.java @@ -16,7 +16,17 @@ */ package org.keycloak.testsuite.admin; -import org.jboss.logging.Logger; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.StatusType; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; @@ -36,15 +46,7 @@ import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import jakarta.ws.rs.WebApplicationException; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; -import jakarta.ws.rs.core.Response.StatusType; -import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; +import org.jboss.logging.Logger; import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/Users.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/Users.java index 3a5e3b29b18..63485312f5d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/Users.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/admin/Users.java @@ -16,12 +16,12 @@ */ package org.keycloak.testsuite.admin; -import org.keycloak.representations.idm.CredentialRepresentation; -import org.keycloak.representations.idm.UserRepresentation; - import java.util.ArrayList; import java.util.List; +import org.keycloak.representations.idm.CredentialRepresentation; +import org.keycloak.representations.idm.UserRepresentation; + import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java index 3ff3e80330b..72f0aff0687 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AppServerTestEnricher.java @@ -17,29 +17,6 @@ package org.keycloak.testsuite.arquillian; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; -import org.jboss.arquillian.container.test.api.ContainerController; -import org.jboss.arquillian.core.api.Instance; -import org.jboss.arquillian.core.api.annotation.Inject; -import org.jboss.arquillian.core.api.annotation.Observes; -import org.jboss.arquillian.test.spi.event.suite.AfterClass; -import org.jboss.arquillian.test.spi.event.suite.BeforeClass; -import org.jboss.logging.Logger; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; -import org.keycloak.testsuite.arquillian.annotation.AppServerContainers; -import org.keycloak.testsuite.arquillian.containers.SelfManagedAppContainerLifecycle; -import org.wildfly.extras.creaper.core.CommandFailedException; -import org.wildfly.extras.creaper.core.ManagementClient; -import org.wildfly.extras.creaper.core.online.CliException; -import org.wildfly.extras.creaper.core.online.ManagementProtocol; -import org.wildfly.extras.creaper.core.online.OnlineManagementClient; -import org.wildfly.extras.creaper.core.online.OnlineOptions; -import org.wildfly.extras.creaper.core.online.operations.Address; -import org.wildfly.extras.creaper.core.online.operations.OperationException; -import org.wildfly.extras.creaper.core.online.operations.Operations; -import org.wildfly.extras.creaper.core.online.operations.admin.Administration; - import java.io.File; import java.io.IOException; import java.lang.reflect.Method; @@ -54,6 +31,30 @@ import java.util.Set; import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; +import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; +import org.keycloak.testsuite.arquillian.annotation.AppServerContainers; +import org.keycloak.testsuite.arquillian.containers.SelfManagedAppContainerLifecycle; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang.StringUtils; +import org.jboss.arquillian.container.test.api.ContainerController; +import org.jboss.arquillian.core.api.Instance; +import org.jboss.arquillian.core.api.annotation.Inject; +import org.jboss.arquillian.core.api.annotation.Observes; +import org.jboss.arquillian.test.spi.event.suite.AfterClass; +import org.jboss.arquillian.test.spi.event.suite.BeforeClass; +import org.jboss.logging.Logger; +import org.wildfly.extras.creaper.core.CommandFailedException; +import org.wildfly.extras.creaper.core.ManagementClient; +import org.wildfly.extras.creaper.core.online.CliException; +import org.wildfly.extras.creaper.core.online.ManagementProtocol; +import org.wildfly.extras.creaper.core.online.OnlineManagementClient; +import org.wildfly.extras.creaper.core.online.OnlineOptions; +import org.wildfly.extras.creaper.core.online.operations.Address; +import org.wildfly.extras.creaper.core.online.operations.OperationException; +import org.wildfly.extras.creaper.core.online.operations.Operations; +import org.wildfly.extras.creaper.core.online.operations.admin.Administration; + import static org.keycloak.testsuite.arquillian.ServerTestEnricherUtil.reloadOrRestartTimeoutClient; import static org.keycloak.testsuite.util.ServerURLs.getAppServerContextRoot; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java index a281b194a23..2b0845b7bdc 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java @@ -16,11 +16,50 @@ */ package org.keycloak.testsuite.arquillian; +import java.io.File; +import java.io.FileFilter; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.security.Provider; +import java.security.Security; +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import jakarta.ws.rs.NotFoundException; + +import org.keycloak.admin.client.Keycloak; +import org.keycloak.common.crypto.FipsMode; +import org.keycloak.common.util.StringPropertyReplacer; +import org.keycloak.common.util.SystemEnvProperties; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.services.error.KeycloakErrorHandler; +import org.keycloak.testsuite.ProfileAssume; +import org.keycloak.testsuite.arquillian.annotation.EnableVault; +import org.keycloak.testsuite.arquillian.annotation.SetDefaultProvider; +import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; +import org.keycloak.testsuite.client.KeycloakTestingClient; +import org.keycloak.testsuite.util.HttpClientUtils; +import org.keycloak.testsuite.util.SpiProvidersSwitchingUtils; +import org.keycloak.testsuite.util.SqlUtils; +import org.keycloak.testsuite.util.SystemInfoHelper; +import org.keycloak.testsuite.util.TextFileChecker; +import org.keycloak.testsuite.util.VaultUtils; +import org.keycloak.testsuite.util.oauth.OAuthClient; + import org.apache.commons.io.filefilter.WildcardFileFilter; import org.apache.commons.lang.StringUtils; import org.jboss.arquillian.container.spi.ContainerRegistry; -import org.jboss.arquillian.container.spi.client.container.LifecycleException; import org.jboss.arquillian.container.spi.client.container.DeploymentException; +import org.jboss.arquillian.container.spi.client.container.LifecycleException; import org.jboss.arquillian.container.spi.event.StartContainer; import org.jboss.arquillian.container.spi.event.StartSuiteContainers; import org.jboss.arquillian.container.spi.event.StopContainer; @@ -34,51 +73,13 @@ import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.core.api.annotation.Observes; import org.jboss.arquillian.test.spi.annotation.ClassScoped; import org.jboss.arquillian.test.spi.annotation.SuiteScoped; +import org.jboss.arquillian.test.spi.event.suite.After; import org.jboss.arquillian.test.spi.event.suite.AfterClass; import org.jboss.arquillian.test.spi.event.suite.AfterSuite; +import org.jboss.arquillian.test.spi.event.suite.Before; import org.jboss.arquillian.test.spi.event.suite.BeforeClass; import org.jboss.arquillian.test.spi.event.suite.BeforeSuite; import org.jboss.logging.Logger; -import org.keycloak.admin.client.Keycloak; -import org.keycloak.common.crypto.FipsMode; -import org.keycloak.common.util.StringPropertyReplacer; -import org.keycloak.common.util.SystemEnvProperties; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.services.error.KeycloakErrorHandler; -import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.annotation.SetDefaultProvider; -import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; -import org.keycloak.testsuite.arquillian.annotation.EnableVault; -import org.keycloak.testsuite.client.KeycloakTestingClient; -import org.keycloak.testsuite.util.HttpClientUtils; -import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.SpiProvidersSwitchingUtils; -import org.keycloak.testsuite.util.SqlUtils; -import org.keycloak.testsuite.util.SystemInfoHelper; -import org.keycloak.testsuite.util.VaultUtils; -import org.keycloak.testsuite.util.TextFileChecker; - -import java.io.File; -import java.io.FileFilter; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URL; -import java.security.Provider; -import java.security.Security; -import java.util.List; -import java.util.Optional; -import java.util.Set; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import jakarta.ws.rs.NotFoundException; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import org.jboss.arquillian.test.spi.event.suite.After; -import org.jboss.arquillian.test.spi.event.suite.Before; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.Assert; import org.w3c.dom.Document; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainerInfo.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainerInfo.java index 702e26a6cd0..40730428e8e 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainerInfo.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainerInfo.java @@ -1,14 +1,15 @@ package org.keycloak.testsuite.arquillian; -import org.jboss.arquillian.container.spi.Container; -import org.jboss.arquillian.container.spi.Container.State; -import org.keycloak.common.util.KeycloakUriBuilder; - import java.net.URISyntaxException; import java.net.URL; import java.util.Map; import java.util.Objects; +import org.keycloak.common.util.KeycloakUriBuilder; + +import org.jboss.arquillian.container.spi.Container; +import org.jboss.arquillian.container.spi.Container.State; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java index b7c9f6b51e5..02f216e82a0 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentArchiveProcessor.java @@ -17,33 +17,35 @@ package org.keycloak.testsuite.arquillian; +import java.io.File; +import java.io.IOException; + +import org.keycloak.representations.adapters.config.AdapterConfig; +import org.keycloak.testsuite.utils.io.IOUtil; +import org.keycloak.util.JsonSerialization; + import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; import org.jboss.arquillian.core.api.InstanceProducer; import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.test.spi.TestClass; import org.jboss.arquillian.test.spi.annotation.ClassScoped; +import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.jboss.shrinkwrap.resolver.api.maven.MavenFormatStage; import org.jboss.shrinkwrap.resolver.api.maven.MavenResolverSystem; -import org.keycloak.representations.adapters.config.AdapterConfig; -import org.keycloak.testsuite.utils.io.IOUtil; -import org.keycloak.util.JsonSerialization; import org.w3c.dom.Document; -import java.io.File; -import java.io.IOException; -import org.jboss.logging.Logger; import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isRelative; -import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isWLSAppServer; import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isWASAppServer; +import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.isWLSAppServer; +import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; import static org.keycloak.testsuite.utils.io.IOUtil.documentToString; import static org.keycloak.testsuite.utils.io.IOUtil.loadJson; import static org.keycloak.testsuite.utils.io.IOUtil.loadXML; import static org.keycloak.testsuite.utils.io.IOUtil.modifyDocElementAttribute; -import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentTargetModifier.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentTargetModifier.java index 3a7c388ca2f..c78162b7ef7 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentTargetModifier.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/DeploymentTargetModifier.java @@ -18,20 +18,22 @@ package org.keycloak.testsuite.arquillian; import java.util.ArrayList; -import java.util.Objects; import java.util.List; +import java.util.Objects; import java.util.Set; -import org.jboss.arquillian.container.spi.client.deployment.DeploymentDescription; -import org.jboss.arquillian.container.spi.client.deployment.TargetDescription; -import org.jboss.arquillian.core.api.Instance; -import org.jboss.arquillian.core.api.annotation.Inject; -import org.jboss.arquillian.container.test.impl.client.deployment.AnnotationDeploymentScenarioGenerator; -import org.jboss.arquillian.test.spi.TestClass; -import org.jboss.logging.Logger; + import org.keycloak.common.util.StringPropertyReplacer; import org.keycloak.common.util.SystemEnvProperties; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; +import org.jboss.arquillian.container.spi.client.deployment.DeploymentDescription; +import org.jboss.arquillian.container.spi.client.deployment.TargetDescription; +import org.jboss.arquillian.container.test.impl.client.deployment.AnnotationDeploymentScenarioGenerator; +import org.jboss.arquillian.core.api.Instance; +import org.jboss.arquillian.core.api.annotation.Inject; +import org.jboss.arquillian.test.spi.TestClass; +import org.jboss.logging.Logger; + import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.getAppServerQualifiers; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/InfinispanStatistics.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/InfinispanStatistics.java index b315937d360..6925e9cf523 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/InfinispanStatistics.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/InfinispanStatistics.java @@ -16,10 +16,11 @@ */ package org.keycloak.testsuite.arquillian; -import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import java.util.Map; import java.util.concurrent.TimeUnit; +import org.keycloak.connections.infinispan.InfinispanConnectionProvider; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/KeycloakArquillianExtension.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/KeycloakArquillianExtension.java index 0a6aedae30f..dbf51c3dd6e 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/KeycloakArquillianExtension.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/KeycloakArquillianExtension.java @@ -17,20 +17,12 @@ package org.keycloak.testsuite.arquillian; -import org.jboss.arquillian.container.test.impl.enricher.resource.URLResourceProvider; -import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; -import org.jboss.arquillian.container.test.spi.client.deployment.DeploymentScenarioGenerator; -import org.jboss.arquillian.core.spi.LoadableExtension; -import org.jboss.arquillian.graphene.location.ContainerCustomizableURLResourceProvider; -import org.jboss.arquillian.graphene.location.CustomizableURLResourceProvider; -import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; -import org.jboss.arquillian.test.spi.execution.TestExecutionDecider; +import org.keycloak.testsuite.arquillian.decider.AdapterTestExecutionDecider; +import org.keycloak.testsuite.arquillian.decider.AuthServerExcludeExecutionDecider; import org.keycloak.testsuite.arquillian.decider.BrowserDriverIgnoreDecider; +import org.keycloak.testsuite.arquillian.decider.MigrationTestExecutionDecider; import org.keycloak.testsuite.arquillian.h2.H2TestEnricher; import org.keycloak.testsuite.arquillian.jmx.JmxConnectorRegistryCreator; -import org.keycloak.testsuite.arquillian.decider.AdapterTestExecutionDecider; -import org.keycloak.testsuite.arquillian.decider.MigrationTestExecutionDecider; -import org.keycloak.testsuite.arquillian.decider.AuthServerExcludeExecutionDecider; import org.keycloak.testsuite.arquillian.provider.AdminClientProvider; import org.keycloak.testsuite.arquillian.provider.LoadBalancerControllerProvider; import org.keycloak.testsuite.arquillian.provider.OAuthClientProvider; @@ -41,6 +33,15 @@ import org.keycloak.testsuite.drone.HtmlUnitScreenshots; import org.keycloak.testsuite.drone.KeycloakDronePostSetup; import org.keycloak.testsuite.drone.KeycloakWebDriverConfigurator; +import org.jboss.arquillian.container.test.impl.enricher.resource.URLResourceProvider; +import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; +import org.jboss.arquillian.container.test.spi.client.deployment.DeploymentScenarioGenerator; +import org.jboss.arquillian.core.spi.LoadableExtension; +import org.jboss.arquillian.graphene.location.ContainerCustomizableURLResourceProvider; +import org.jboss.arquillian.graphene.location.CustomizableURLResourceProvider; +import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; +import org.jboss.arquillian.test.spi.execution.TestExecutionDecider; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ModelTestExecutor.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ModelTestExecutor.java index b6b6cbc7bcd..109aead7934 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ModelTestExecutor.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ModelTestExecutor.java @@ -20,15 +20,16 @@ package org.keycloak.testsuite.arquillian; import java.lang.reflect.Field; import java.lang.reflect.Method; +import org.keycloak.common.util.reflections.Reflections; +import org.keycloak.testsuite.arquillian.annotation.ModelTest; +import org.keycloak.testsuite.client.KeycloakTestingClient; + import org.jboss.arquillian.container.test.impl.execution.LocalTestExecuter; import org.jboss.arquillian.container.test.impl.execution.event.LocalExecutionEvent; import org.jboss.arquillian.core.api.Instance; import org.jboss.arquillian.core.api.InstanceProducer; import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.test.spi.TestResult; -import org.keycloak.common.util.reflections.Reflections; -import org.keycloak.testsuite.arquillian.annotation.ModelTest; -import org.keycloak.testsuite.client.KeycloakTestingClient; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ServerTestEnricherUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ServerTestEnricherUtil.java index 2cb1eceaa97..4da71f4b4cd 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ServerTestEnricherUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ServerTestEnricherUtil.java @@ -17,6 +17,9 @@ package org.keycloak.testsuite.arquillian; +import java.io.IOException; +import java.util.concurrent.TimeoutException; + import org.jboss.logging.Logger; import org.wildfly.extras.creaper.commands.undertow.AddUndertowListener; import org.wildfly.extras.creaper.commands.undertow.RemoveUndertowListener; @@ -26,9 +29,6 @@ import org.wildfly.extras.creaper.core.CommandFailedException; import org.wildfly.extras.creaper.core.online.OnlineManagementClient; import org.wildfly.extras.creaper.core.online.operations.admin.Administration; -import java.io.IOException; -import java.util.concurrent.TimeoutException; - public class ServerTestEnricherUtil { private final static Logger LOG = Logger.getLogger(ServerTestEnricherUtil.class); diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java index 6bdf2465ce8..c5e9754ca22 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/SuiteContext.java @@ -18,16 +18,16 @@ package org.keycloak.testsuite.arquillian; import java.util.ArrayList; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; import org.keycloak.testsuite.arquillian.migration.MigrationContext; - import org.keycloak.testsuite.util.TextFileChecker; -import java.util.LinkedList; import static java.lang.Boolean.parseBoolean; + import static org.keycloak.testsuite.util.MailServerConfiguration.FROM; import static org.keycloak.testsuite.util.MailServerConfiguration.HOST; import static org.keycloak.testsuite.util.MailServerConfiguration.PORT; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/TestClassProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/TestClassProvider.java index f95cfb0e69c..d77e293d72f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/TestClassProvider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/TestClassProvider.java @@ -1,5 +1,7 @@ package org.keycloak.testsuite.arquillian; +import java.net.URL; + import io.undertow.Handlers; import io.undertow.Undertow; import io.undertow.UndertowMessages; @@ -9,8 +11,6 @@ import io.undertow.server.handlers.resource.ResourceManager; import io.undertow.server.handlers.resource.URLResource; import org.jboss.logging.Logger; -import java.net.URL; - public class TestClassProvider { private static final Logger LOGGER = Logger.getLogger(TestClassProvider.class); diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/TestContext.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/TestContext.java index 7e68a5a6a29..b8892323342 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/TestContext.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/TestContext.java @@ -28,12 +28,13 @@ import java.util.stream.Collectors; import org.keycloak.admin.client.Keycloak; import org.keycloak.representations.idm.RealmRepresentation; -import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.getAppServerQualifiers; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.TestCleanup; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; +import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.getAppServerQualifiers; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/VaultTestExecutionDecider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/VaultTestExecutionDecider.java index 95b8e00cc14..cfd136ad11b 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/VaultTestExecutionDecider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/VaultTestExecutionDecider.java @@ -19,11 +19,12 @@ package org.keycloak.testsuite.arquillian; import java.lang.reflect.Method; +import org.keycloak.testsuite.arquillian.annotation.EnableVault; + import org.jboss.arquillian.core.api.Instance; import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.test.spi.execution.ExecutionDecision; import org.jboss.arquillian.test.spi.execution.TestExecutionDecider; -import org.keycloak.testsuite.arquillian.annotation.EnableVault; /** * A {@link TestExecutionDecider} that skips tests annotated with {@link EnableVault} with the Elytron credential store diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/DisableFeature.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/DisableFeature.java index 41ae3a6a6fc..458af11b826 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/DisableFeature.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/DisableFeature.java @@ -1,12 +1,12 @@ package org.keycloak.testsuite.arquillian.annotation; -import org.keycloak.common.Profile; - import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import org.keycloak.common.Profile; + import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/EnableFeature.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/EnableFeature.java index ebd54161b73..6830c0f6db1 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/EnableFeature.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/EnableFeature.java @@ -1,12 +1,12 @@ package org.keycloak.testsuite.arquillian.annotation; -import org.keycloak.common.Profile; - import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import org.keycloak.common.Profile; + import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/EnableVault.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/EnableVault.java index 1554fe61f88..4e4d62d9295 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/EnableVault.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/EnableVault.java @@ -49,4 +49,3 @@ public @interface EnableVault { PROVIDER_ID providerId() default PROVIDER_ID.PLAINTEXT; } - diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/IgnoreBrowserDriver.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/IgnoreBrowserDriver.java index 933e68a28f0..7e79ecbab0f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/IgnoreBrowserDriver.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/IgnoreBrowserDriver.java @@ -17,14 +17,14 @@ package org.keycloak.testsuite.arquillian.annotation; -import org.openqa.selenium.WebDriver; - import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.Target; +import org.openqa.selenium.WebDriver; + import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/UncaughtServerErrorExpected.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/UncaughtServerErrorExpected.java index 9af0ff42df5..7e3742902b6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/UncaughtServerErrorExpected.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/annotation/UncaughtServerErrorExpected.java @@ -20,6 +20,7 @@ import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.Target; + import static java.lang.annotation.RetentionPolicy.RUNTIME; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/AbstractQuarkusDeployableContainer.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/AbstractQuarkusDeployableContainer.java index a89203a5d84..32d461f9be5 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/AbstractQuarkusDeployableContainer.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/AbstractQuarkusDeployableContainer.java @@ -40,7 +40,6 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; - import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; @@ -48,6 +47,15 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; +import org.keycloak.common.Profile; +import org.keycloak.common.Profile.Feature.Type; +import org.keycloak.common.crypto.FipsMode; +import org.keycloak.testsuite.ProfileAssume; +import org.keycloak.testsuite.arquillian.SuiteContext; +import org.keycloak.testsuite.auth.page.AuthRealm; +import org.keycloak.testsuite.model.StoreProvider; +import org.keycloak.utils.StringUtil; + import org.apache.commons.lang3.SystemUtils; import org.jboss.arquillian.container.spi.client.container.DeployableContainer; import org.jboss.arquillian.container.spi.client.container.DeploymentException; @@ -60,14 +68,6 @@ import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.descriptor.api.Descriptor; -import org.keycloak.common.Profile; -import org.keycloak.common.Profile.Feature.Type; -import org.keycloak.common.crypto.FipsMode; -import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.arquillian.SuiteContext; -import org.keycloak.testsuite.auth.page.AuthRealm; -import org.keycloak.testsuite.model.StoreProvider; -import org.keycloak.utils.StringUtil; public abstract class AbstractQuarkusDeployableContainer implements DeployableContainer { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerConfiguration.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerConfiguration.java index c0553978939..ce671b185c9 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerConfiguration.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerConfiguration.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.arquillian.containers; import java.io.File; + import org.apache.commons.validator.routines.IntegerValidator; import org.jboss.arquillian.container.spi.ConfigurationException; import org.jboss.arquillian.container.spi.client.container.ContainerConfiguration; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerDeployableContainer.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerDeployableContainer.java index 87470c15d76..7f3eb368c18 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerDeployableContainer.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/InfinispanServerDeployableContainer.java @@ -34,6 +34,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; + import org.jboss.arquillian.container.spi.client.container.DeployableContainer; import org.jboss.arquillian.container.spi.client.container.DeploymentException; import org.jboss.arquillian.container.spi.client.container.LifecycleException; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerDeployController.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerDeployController.java index e31e67e560e..370a669e0d4 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerDeployController.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerDeployController.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.arquillian.containers; import java.util.List; + import org.jboss.arquillian.container.impl.client.container.ContainerDeployController; import org.jboss.arquillian.container.spi.Container; import org.jboss.arquillian.container.spi.ContainerRegistry; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerEventsController.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerEventsController.java index 7533990592b..3e434c89f8b 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerEventsController.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerEventsController.java @@ -16,6 +16,10 @@ */ package org.keycloak.testsuite.arquillian.containers; +import java.io.IOException; + +import org.keycloak.testsuite.arquillian.ContainerInfo; + import org.jboss.arquillian.container.spi.ContainerRegistry; import org.jboss.arquillian.container.spi.event.ContainerMultiControlEvent; import org.jboss.arquillian.container.spi.event.StopClassContainers; @@ -30,18 +34,14 @@ import org.jboss.arquillian.core.api.annotation.Observes; import org.jboss.arquillian.test.spi.event.suite.AfterClass; import org.jboss.arquillian.test.spi.event.suite.AfterSuite; import org.jboss.logging.Logger; +import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.exporter.ZipExporter; -import org.keycloak.testsuite.arquillian.ContainerInfo; import org.wildfly.extras.creaper.commands.deployments.Deploy; import org.wildfly.extras.creaper.commands.deployments.Undeploy; import org.wildfly.extras.creaper.core.CommandFailedException; import org.wildfly.extras.creaper.core.ManagementClient; import org.wildfly.extras.creaper.core.online.OnlineOptions; -import java.io.IOException; - -import org.jboss.shrinkwrap.api.Archive; - /** * Changes behaviour of original ContainerEventController to stop manual containers * @AfterSuite, not @AfterClass diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerFeaturesController.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerFeaturesController.java index d1e9fcfea9e..ed895f884ad 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerFeaturesController.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerFeaturesController.java @@ -1,15 +1,15 @@ package org.keycloak.testsuite.arquillian.containers; -import org.jboss.arquillian.container.spi.event.StartContainer; -import org.jboss.arquillian.container.spi.event.StopContainer; -import org.jboss.arquillian.core.api.Event; -import org.jboss.arquillian.core.api.Instance; -import org.jboss.arquillian.core.api.annotation.Inject; -import org.jboss.arquillian.core.api.annotation.Observes; -import org.jboss.arquillian.test.spi.event.suite.After; -import org.jboss.arquillian.test.spi.event.suite.AfterClass; -import org.jboss.arquillian.test.spi.event.suite.Before; -import org.jboss.arquillian.test.spi.event.suite.BeforeClass; +import java.lang.reflect.AnnotatedElement; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.function.BiConsumer; +import java.util.stream.Collectors; + import org.keycloak.common.Profile; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.arquillian.SuiteContext; @@ -22,15 +22,16 @@ import org.keycloak.testsuite.arquillian.annotation.SetDefaultProvider; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.util.SpiProvidersSwitchingUtils; -import java.lang.reflect.AnnotatedElement; -import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; -import java.util.function.BiConsumer; -import java.util.stream.Collectors; +import org.jboss.arquillian.container.spi.event.StartContainer; +import org.jboss.arquillian.container.spi.event.StopContainer; +import org.jboss.arquillian.core.api.Event; +import org.jboss.arquillian.core.api.Instance; +import org.jboss.arquillian.core.api.annotation.Inject; +import org.jboss.arquillian.core.api.annotation.Observes; +import org.jboss.arquillian.test.spi.event.suite.After; +import org.jboss.arquillian.test.spi.event.suite.AfterClass; +import org.jboss.arquillian.test.spi.event.suite.Before; +import org.jboss.arquillian.test.spi.event.suite.BeforeClass; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerTestExtension.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerTestExtension.java index 3e1db9ac020..6a67057893a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerTestExtension.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakContainerTestExtension.java @@ -16,6 +16,8 @@ */ package org.keycloak.testsuite.arquillian.containers; +import org.keycloak.testsuite.arquillian.ModelTestExecutor; + import org.jboss.arquillian.container.test.impl.ClientTestInstanceEnricher; import org.jboss.arquillian.container.test.impl.client.LocalCommandService; import org.jboss.arquillian.container.test.impl.client.container.ClientContainerControllerCreator; @@ -48,7 +50,6 @@ import org.jboss.arquillian.test.impl.context.TestContextImpl; import org.jboss.arquillian.test.impl.enricher.resource.ArquillianResourceTestEnricher; import org.jboss.arquillian.test.spi.TestEnricher; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; -import org.keycloak.testsuite.arquillian.ModelTestExecutor; /** * KeycloakContainerTestExtension diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusConfiguration.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusConfiguration.java index 6a7a62f050b..13994c683df 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusConfiguration.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusConfiguration.java @@ -1,12 +1,13 @@ package org.keycloak.testsuite.arquillian.containers; +import java.nio.file.Path; +import java.nio.file.Paths; + +import org.keycloak.common.crypto.FipsMode; + import org.jboss.arquillian.container.spi.ConfigurationException; import org.jboss.arquillian.container.spi.client.container.ContainerConfiguration; import org.jboss.logging.Logger; -import org.keycloak.common.crypto.FipsMode; - -import java.nio.file.Path; -import java.nio.file.Paths; /** * @author mhajas diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusEmbeddedDeployableContainer.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusEmbeddedDeployableContainer.java index c042a4d857f..9ffd99709cb 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusEmbeddedDeployableContainer.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusEmbeddedDeployableContainer.java @@ -1,11 +1,13 @@ package org.keycloak.testsuite.arquillian.containers; import java.util.List; -import org.jboss.arquillian.container.spi.client.container.LifecycleException; -import org.jboss.logging.Logger; + import org.keycloak.Keycloak; import org.keycloak.common.Version; +import org.jboss.arquillian.container.spi.client.container.LifecycleException; +import org.jboss.logging.Logger; + /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusServerDeployableContainer.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusServerDeployableContainer.java index 657845023d3..bf6aa981520 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusServerDeployableContainer.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/KeycloakQuarkusServerDeployableContainer.java @@ -1,10 +1,5 @@ package org.keycloak.testsuite.arquillian.containers; -import org.jboss.arquillian.container.spi.client.container.LifecycleException; -import org.jboss.logging.Logger; -import org.keycloak.testsuite.model.StoreProvider; -import org.keycloak.testsuite.util.WaitUtils; - import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; @@ -30,6 +25,12 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import org.keycloak.testsuite.model.StoreProvider; +import org.keycloak.testsuite.util.WaitUtils; + +import org.jboss.arquillian.container.spi.client.container.LifecycleException; +import org.jboss.logging.Logger; + /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/MultipleContainersExtension.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/MultipleContainersExtension.java index b59e7ba4cf1..f5f93bb9abc 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/MultipleContainersExtension.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/MultipleContainersExtension.java @@ -16,6 +16,8 @@ */ package org.keycloak.testsuite.arquillian.containers; +import java.util.logging.Logger; + import org.jboss.arquillian.container.impl.client.ContainerDeploymentContextHandler; import org.jboss.arquillian.container.impl.client.container.ContainerLifecycleController; import org.jboss.arquillian.container.impl.client.container.DeploymentExceptionHandler; @@ -25,8 +27,6 @@ import org.jboss.arquillian.container.impl.context.DeploymentContextImpl; import org.jboss.arquillian.container.spi.client.container.DeployableContainer; import org.jboss.arquillian.core.spi.LoadableExtension; -import java.util.logging.Logger; - /** * Enables multiple container adapters on classpath. * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/Registry.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/Registry.java index 4c3a345e06f..f6edc7f6039 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/Registry.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/Registry.java @@ -16,6 +16,13 @@ */ package org.keycloak.testsuite.arquillian.containers; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.jboss.arquillian.config.descriptor.api.ContainerDef; import org.jboss.arquillian.container.impl.ContainerCreationException; import org.jboss.arquillian.container.impl.ContainerImpl; @@ -28,13 +35,6 @@ import org.jboss.arquillian.core.api.Injector; import org.jboss.arquillian.core.spi.ServiceLoader; import org.jboss.arquillian.core.spi.Validate; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - import static org.keycloak.testsuite.arquillian.containers.RegistryCreator.ADAPTER_IMPL_CONFIG_STRING; import static org.keycloak.testsuite.arquillian.containers.RegistryCreator.getAdapterImplClassValue; import static org.keycloak.testsuite.arquillian.containers.RegistryCreator.getContainerAdapter; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/RegistryCreator.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/RegistryCreator.java index 29b8e411d88..66e29e3bb20 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/RegistryCreator.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/RegistryCreator.java @@ -16,6 +16,12 @@ */ package org.keycloak.testsuite.arquillian.containers; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import org.keycloak.testsuite.arquillian.container.AppServerContainerService; + import org.jboss.arquillian.config.descriptor.api.ArquillianDescriptor; import org.jboss.arquillian.config.descriptor.api.ContainerDef; import org.jboss.arquillian.config.descriptor.api.GroupDef; @@ -34,11 +40,7 @@ import org.jboss.arquillian.core.spi.Validate; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.descriptor.spi.node.Node; import org.jboss.shrinkwrap.descriptor.spi.node.NodeDescriptor; -import org.keycloak.testsuite.arquillian.container.AppServerContainerService; import org.mvel2.MVEL; -import java.util.Collection; -import java.util.List; -import java.util.Map; import static org.keycloak.testsuite.arquillian.containers.SecurityActions.isClassPresent; import static org.keycloak.testsuite.arquillian.containers.SecurityActions.loadClass; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/SelfManagedAppContainerLifecycle.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/SelfManagedAppContainerLifecycle.java index 465f1132c30..3b31896aa8b 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/SelfManagedAppContainerLifecycle.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/SelfManagedAppContainerLifecycle.java @@ -16,13 +16,13 @@ */ package org.keycloak.testsuite.arquillian.containers; +import java.io.IOException; +import java.util.concurrent.TimeoutException; + import org.wildfly.extras.creaper.core.CommandFailedException; import org.wildfly.extras.creaper.core.online.CliException; import org.wildfly.extras.creaper.core.online.operations.OperationException; -import java.io.IOException; -import java.util.concurrent.TimeoutException; - /** * The test implementing the interface is expected to maintain container lifecycle * itself. No app server container will be started. diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AdapterTestExecutionDecider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AdapterTestExecutionDecider.java index a1516d0e85c..6a00992bf69 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AdapterTestExecutionDecider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AdapterTestExecutionDecider.java @@ -19,15 +19,17 @@ package org.keycloak.testsuite.arquillian.decider; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; -import org.jboss.arquillian.test.spi.execution.ExecutionDecision; -import org.jboss.arquillian.test.spi.execution.TestExecutionDecider; -import org.jboss.arquillian.core.api.Instance; -import org.jboss.arquillian.core.api.annotation.Inject; + import org.keycloak.testsuite.arquillian.AppServerTestEnricher; import org.keycloak.testsuite.arquillian.TestContext; import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; import org.keycloak.testsuite.arquillian.annotation.AppServerContainers; +import org.jboss.arquillian.core.api.Instance; +import org.jboss.arquillian.core.api.annotation.Inject; +import org.jboss.arquillian.test.spi.execution.ExecutionDecision; +import org.jboss.arquillian.test.spi.execution.TestExecutionDecider; + /** * @author Vlastislav Ramik */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AuthServerExcludeExecutionDecider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AuthServerExcludeExecutionDecider.java index 06d772b3b5d..85d210c9795 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AuthServerExcludeExecutionDecider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/AuthServerExcludeExecutionDecider.java @@ -19,16 +19,18 @@ package org.keycloak.testsuite.arquillian.decider; import java.lang.reflect.Method; import java.util.Arrays; import java.util.List; -import org.jboss.arquillian.test.spi.execution.ExecutionDecision; -import org.jboss.arquillian.test.spi.execution.TestExecutionDecider; -import org.jboss.arquillian.core.api.Instance; -import org.jboss.arquillian.core.api.annotation.Inject; + import org.keycloak.testsuite.arquillian.AppServerTestEnricher; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.arquillian.TestContext; import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude.AuthServer; +import org.jboss.arquillian.core.api.Instance; +import org.jboss.arquillian.core.api.annotation.Inject; +import org.jboss.arquillian.test.spi.execution.ExecutionDecision; +import org.jboss.arquillian.test.spi.execution.TestExecutionDecider; + public class AuthServerExcludeExecutionDecider implements TestExecutionDecider { @Inject private Instance testContextInstance; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/BrowserDriverIgnoreDecider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/BrowserDriverIgnoreDecider.java index beca9f6c140..f73e83a2ac3 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/BrowserDriverIgnoreDecider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/BrowserDriverIgnoreDecider.java @@ -17,20 +17,21 @@ package org.keycloak.testsuite.arquillian.decider; -import org.jboss.arquillian.core.api.Instance; -import org.jboss.arquillian.core.api.annotation.Inject; -import org.jboss.arquillian.test.spi.execution.ExecutionDecision; -import org.jboss.arquillian.test.spi.execution.TestExecutionDecider; -import org.keycloak.testsuite.arquillian.TestContext; -import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; -import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDrivers; -import org.openqa.selenium.WebDriver; - import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; import java.util.Arrays; import java.util.function.Predicate; +import org.keycloak.testsuite.arquillian.TestContext; +import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; +import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDrivers; + +import org.jboss.arquillian.core.api.Instance; +import org.jboss.arquillian.core.api.annotation.Inject; +import org.jboss.arquillian.test.spi.execution.ExecutionDecision; +import org.jboss.arquillian.test.spi.execution.TestExecutionDecider; +import org.openqa.selenium.WebDriver; + import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverInstanceOf; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/MigrationTestExecutionDecider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/MigrationTestExecutionDecider.java index 8c5aa463bc0..8cff2761567 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/MigrationTestExecutionDecider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/decider/MigrationTestExecutionDecider.java @@ -16,12 +16,13 @@ */ package org.keycloak.testsuite.arquillian.decider; +import java.lang.reflect.Method; + +import org.keycloak.testsuite.arquillian.migration.Migration; + import org.jboss.arquillian.test.spi.execution.ExecutionDecision; import org.jboss.arquillian.test.spi.execution.TestExecutionDecider; - -import java.lang.reflect.Method; import org.jboss.logging.Logger; -import org.keycloak.testsuite.arquillian.migration.Migration; /** * @author Vlastislav Ramik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/h2/H2TestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/h2/H2TestEnricher.java index 2201d595d20..0878fa16173 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/h2/H2TestEnricher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/h2/H2TestEnricher.java @@ -1,13 +1,13 @@ package org.keycloak.testsuite.arquillian.h2; +import java.sql.SQLException; + import org.h2.tools.Server; import org.jboss.arquillian.core.api.annotation.Observes; import org.jboss.arquillian.test.spi.event.suite.AfterSuite; import org.jboss.arquillian.test.spi.event.suite.BeforeSuite; import org.jboss.logging.Logger; -import java.sql.SQLException; - /** * Starts H2 before suite and stops it after. * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/jmx/JmxConnectorRegistryCreator.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/jmx/JmxConnectorRegistryCreator.java index 29805a9c7ab..fa44b6063ba 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/jmx/JmxConnectorRegistryCreator.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/jmx/JmxConnectorRegistryCreator.java @@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentMap; import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; + import org.jboss.arquillian.core.api.InstanceProducer; import org.jboss.arquillian.core.api.annotation.ApplicationScoped; import org.jboss.arquillian.core.api.annotation.Inject; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/migration/MigrationContext.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/migration/MigrationContext.java index 78226b80d6b..3ab0c4499d3 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/migration/MigrationContext.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/migration/MigrationContext.java @@ -24,14 +24,15 @@ import java.io.FileWriter; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; -import org.apache.http.impl.client.CloseableHttpClient; -import org.jboss.logging.Logger; import org.keycloak.OAuth2Constants; import org.keycloak.common.util.StreamUtil; import org.keycloak.testsuite.util.HttpClientUtils; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.apache.http.impl.client.CloseableHttpClient; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/AdminClientProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/AdminClientProvider.java index be84b122d55..469086352f3 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/AdminClientProvider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/AdminClientProvider.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.arquillian.provider; +import java.lang.annotation.Annotation; + +import org.keycloak.admin.client.Keycloak; + import org.jboss.arquillian.core.api.Instance; import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; -import org.keycloak.admin.client.Keycloak; - -import java.lang.annotation.Annotation; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/LoadBalancerControllerProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/LoadBalancerControllerProvider.java index af1703d6cbf..568b9641fbb 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/LoadBalancerControllerProvider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/LoadBalancerControllerProvider.java @@ -1,14 +1,16 @@ package org.keycloak.testsuite.arquillian.provider; -import org.keycloak.testsuite.arquillian.annotation.LoadBalancer; import java.lang.annotation.Annotation; + +import org.keycloak.testsuite.arquillian.LoadBalancerController; +import org.keycloak.testsuite.arquillian.annotation.LoadBalancer; + +import org.jboss.arquillian.container.spi.Container; +import org.jboss.arquillian.container.spi.ContainerRegistry; import org.jboss.arquillian.core.api.Instance; import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; -import org.keycloak.testsuite.arquillian.LoadBalancerController; -import org.jboss.arquillian.container.spi.Container; -import org.jboss.arquillian.container.spi.ContainerRegistry; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/OAuthClientProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/OAuthClientProvider.java index 263f1897aa8..54cc4556942 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/OAuthClientProvider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/OAuthClientProvider.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.arquillian.provider; +import java.lang.annotation.Annotation; + +import org.keycloak.testsuite.util.oauth.OAuthClient; + import org.jboss.arquillian.core.api.Instance; import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; -import org.keycloak.testsuite.util.oauth.OAuthClient; - -import java.lang.annotation.Annotation; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/SuiteContextProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/SuiteContextProvider.java index 90708c9ebbb..f1f2f8fa245 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/SuiteContextProvider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/SuiteContextProvider.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.arquillian.provider; +import java.lang.annotation.Annotation; + +import org.keycloak.testsuite.arquillian.SuiteContext; + import org.jboss.arquillian.core.api.Instance; import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; -import org.keycloak.testsuite.arquillian.SuiteContext; - -import java.lang.annotation.Annotation; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/TestContextProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/TestContextProvider.java index aefe3b32e22..5277b2a86f4 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/TestContextProvider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/TestContextProvider.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.arquillian.provider; +import java.lang.annotation.Annotation; + +import org.keycloak.testsuite.arquillian.TestContext; + import org.jboss.arquillian.core.api.Instance; import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider; -import org.keycloak.testsuite.arquillian.TestContext; - -import java.lang.annotation.Annotation; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java index 5f029a4fdf7..cd855e9f7a9 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/provider/URLProvider.java @@ -17,20 +17,6 @@ package org.keycloak.testsuite.arquillian.provider; -import org.apache.http.client.utils.URIBuilder; -import org.jboss.arquillian.container.test.api.OperateOnDeployment; -import org.jboss.arquillian.container.test.impl.enricher.resource.URLResourceProvider; -import org.jboss.arquillian.core.api.Instance; -import org.jboss.arquillian.core.api.annotation.Inject; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.logging.Logger; -import org.keycloak.testsuite.arquillian.SuiteContext; -import org.keycloak.testsuite.arquillian.TestContext; -import org.keycloak.testsuite.arquillian.annotation.AppServerBrowserContext; -import org.keycloak.testsuite.arquillian.annotation.AppServerContext; -import org.keycloak.testsuite.arquillian.annotation.AuthServerBrowserContext; -import org.keycloak.testsuite.arquillian.annotation.AuthServerContext; - import java.lang.annotation.Annotation; import java.net.MalformedURLException; import java.net.URISyntaxException; @@ -38,8 +24,22 @@ import java.net.URL; import java.util.List; import org.keycloak.testsuite.arquillian.ContainerInfo; +import org.keycloak.testsuite.arquillian.SuiteContext; +import org.keycloak.testsuite.arquillian.TestContext; +import org.keycloak.testsuite.arquillian.annotation.AppServerBrowserContext; +import org.keycloak.testsuite.arquillian.annotation.AppServerContext; +import org.keycloak.testsuite.arquillian.annotation.AuthServerBrowserContext; +import org.keycloak.testsuite.arquillian.annotation.AuthServerContext; import org.keycloak.testsuite.util.ServerURLs; +import org.apache.http.client.utils.URIBuilder; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.container.test.impl.enricher.resource.URLResourceProvider; +import org.jboss.arquillian.core.api.Instance; +import org.jboss.arquillian.core.api.annotation.Inject; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.logging.Logger; + import static org.keycloak.testsuite.util.ServerURLs.APP_SERVER_HOST; import static org.keycloak.testsuite.util.ServerURLs.APP_SERVER_PORT; import static org.keycloak.testsuite.util.ServerURLs.APP_SERVER_SCHEME; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AccountFields.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AccountFields.java index 197472a2abb..5b7f7612598 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AccountFields.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AccountFields.java @@ -17,9 +17,10 @@ package org.keycloak.testsuite.auth.page; -import org.jboss.arquillian.graphene.page.Page; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.util.UIUtils; + +import org.jboss.arquillian.graphene.page.Page; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthRealm.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthRealm.java index b2994962384..b5cd6fb8384 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthRealm.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthRealm.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.auth.page; -import org.keycloak.protocol.oidc.OIDCLoginProtocolService; -import org.keycloak.testsuite.auth.page.login.PageWithLoginUrl; +import java.net.URI; import jakarta.ws.rs.core.UriBuilder; -import java.net.URI; + +import org.keycloak.protocol.oidc.OIDCLoginProtocolService; +import org.keycloak.testsuite.auth.page.login.PageWithLoginUrl; /** * Keycloak realm. diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServer.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServer.java index 1affc376c59..7d09c81be5e 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServer.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServer.java @@ -17,9 +17,10 @@ package org.keycloak.testsuite.auth.page; -import jakarta.ws.rs.core.UriBuilder; import java.net.URI; +import jakarta.ws.rs.core.UriBuilder; + /** * Context path of Keycloak auth server. * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServerContextRoot.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServerContextRoot.java index 41ae0e08d84..7f0344200f1 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServerContextRoot.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/AuthServerContextRoot.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.auth.page; -import org.jboss.arquillian.test.api.ArquillianResource; +import java.net.URL; + import org.keycloak.testsuite.arquillian.annotation.AuthServerBrowserContext; import org.keycloak.testsuite.page.AbstractPageWithInjectedUrl; -import java.net.URL; +import org.jboss.arquillian.test.api.ArquillianResource; /** * Context root of the tested Keycloak server. diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/FieldsBase.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/FieldsBase.java index 84b56aa6f34..6837ff82c8e 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/FieldsBase.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/FieldsBase.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.auth.page; import org.keycloak.testsuite.page.Form; + import org.openqa.selenium.By; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/PasswordFields.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/PasswordFields.java index d115ef2d4b3..25f50ee3f52 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/PasswordFields.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/PasswordFields.java @@ -16,8 +16,9 @@ */ package org.keycloak.testsuite.auth.page; -import org.jboss.arquillian.graphene.page.Page; import org.keycloak.testsuite.util.UIUtils; + +import org.jboss.arquillian.graphene.page.Page; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/WelcomePage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/WelcomePage.java index b665d2d3f7e..7f363e47a3f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/WelcomePage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/WelcomePage.java @@ -21,9 +21,9 @@ import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; +import static org.keycloak.testsuite.util.UIUtils.clickLink; import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; import static org.keycloak.testsuite.util.UIUtils.setTextInputValue; -import static org.keycloak.testsuite.util.UIUtils.clickLink; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/DeleteAccountActionConfirmPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/DeleteAccountActionConfirmPage.java index 6e27a00a78b..f6a38fe62b7 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/DeleteAccountActionConfirmPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/DeleteAccountActionConfirmPage.java @@ -1,11 +1,11 @@ package org.keycloak.testsuite.auth.page.login; import org.keycloak.authentication.requiredactions.DeleteAccount; + import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; - import static org.keycloak.testsuite.util.UIUtils.clickLink; public class DeleteAccountActionConfirmPage extends RequiredActions { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/FeedbackMessage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/FeedbackMessage.java index 79dafd9ee5e..e32cf877d5a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/FeedbackMessage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/FeedbackMessage.java @@ -17,14 +17,14 @@ package org.keycloak.testsuite.auth.page.login; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Login.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Login.java index 19de6a300f5..c1bbe3d9eb3 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Login.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Login.java @@ -16,10 +16,10 @@ */ package org.keycloak.testsuite.auth.page.login; -import org.jboss.arquillian.graphene.page.Page; - import jakarta.ws.rs.core.UriBuilder; +import org.jboss.arquillian.graphene.page.Page; + /** * * @author Petr Mensik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginActions.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginActions.java index 5bee2851d37..7dabad82ead 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginActions.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginActions.java @@ -16,12 +16,13 @@ */ package org.keycloak.testsuite.auth.page.login; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.testsuite.util.URLUtils; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import jakarta.ws.rs.core.UriBuilder; - import static org.keycloak.testsuite.util.UIUtils.clickLink; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginBase.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginBase.java index eaf89e69075..e42bc931577 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginBase.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginBase.java @@ -17,9 +17,10 @@ package org.keycloak.testsuite.auth.page.login; -import org.jboss.arquillian.graphene.page.Page; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.console.page.fragment.LocaleDropdown; + +import org.jboss.arquillian.graphene.page.Page; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginForm.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginForm.java index 5c5fba567c6..c53f1dd9db4 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginForm.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/LoginForm.java @@ -16,12 +16,13 @@ */ package org.keycloak.testsuite.auth.page.login; -import org.jboss.arquillian.graphene.page.Page; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.auth.page.AccountFields; import org.keycloak.testsuite.auth.page.PasswordFields; import org.keycloak.testsuite.page.Form; import org.keycloak.testsuite.util.UIUtils; + +import org.jboss.arquillian.graphene.page.Page; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OAuthGrant.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OAuthGrant.java index 4e9ce9ff35e..3d44a86d476 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OAuthGrant.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OAuthGrant.java @@ -16,18 +16,20 @@ */ package org.keycloak.testsuite.auth.page.login; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.common.util.CollectionUtil; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.testsuite.util.DroneUtils; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import java.util.List; -import java.util.stream.Collectors; +import static org.keycloak.testsuite.util.UIUtils.clickLink; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.util.UIUtils.clickLink; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OneTimeCode.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OneTimeCode.java index 6c8cbe9f136..f6ab9801dbd 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OneTimeCode.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/OneTimeCode.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.auth.page.login; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.URLUtils; + import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/PageWithLoginUrl.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/PageWithLoginUrl.java index c6a207540a3..c53ee5470d0 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/PageWithLoginUrl.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/PageWithLoginUrl.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.auth.page.login; -import org.openqa.selenium.WebDriver; - import java.net.URI; +import org.openqa.selenium.WebDriver; + /** * Used by util class LoginAssert. Implementing classes: AuthRealm, AdminConsole. * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Registration.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Registration.java index eef7539bfdb..4556a488747 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Registration.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/Registration.java @@ -16,15 +16,16 @@ */ package org.keycloak.testsuite.auth.page.login; -import org.jboss.arquillian.graphene.page.Page; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.auth.page.AccountFields; import org.keycloak.testsuite.auth.page.PasswordFields; + +import org.jboss.arquillian.graphene.page.Page; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import jakarta.ws.rs.core.UriBuilder; - import static org.keycloak.testsuite.admin.Users.getPasswordOf; import static org.keycloak.testsuite.util.UIUtils.clickLink; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/RequiredActions.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/RequiredActions.java index 31e97f52f77..60076bd47ec 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/RequiredActions.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/RequiredActions.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.auth.page.login; -import org.keycloak.testsuite.util.URLUtils; - import jakarta.ws.rs.core.UriBuilder; +import org.keycloak.testsuite.util.URLUtils; + /** * @author Vaclav Muzikar */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/ResetCredentials.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/ResetCredentials.java index dcc0d514974..bf18ea7a21c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/ResetCredentials.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/ResetCredentials.java @@ -16,14 +16,14 @@ */ package org.keycloak.testsuite.auth.page.login; +import jakarta.ws.rs.core.UriBuilder; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import jakarta.ws.rs.core.UriBuilder; - import static org.keycloak.testsuite.util.UIUtils.clickLink; -import static org.keycloak.testsuite.util.UIUtils.setTextInputValue; import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; +import static org.keycloak.testsuite.util.UIUtils.setTextInputValue; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/SAMLIDPInitiatedLogin.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/SAMLIDPInitiatedLogin.java index 648c3b94981..790ef5c58b5 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/SAMLIDPInitiatedLogin.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/SAMLIDPInitiatedLogin.java @@ -16,4 +16,3 @@ public class SAMLIDPInitiatedLogin extends SAMLRedirectLogin { return super.createUriBuilder().path("clients/{clientUrlName}"); } } - diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/TermsAndConditions.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/TermsAndConditions.java index 9f8bc7cbf40..54624729149 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/TermsAndConditions.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/TermsAndConditions.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.auth.page.login; import org.keycloak.models.UserModel; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdateAccount.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdateAccount.java index 16b3d0974d5..9e61afc2182 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdateAccount.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdateAccount.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.auth.page.login; -import org.jboss.arquillian.graphene.page.Page; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.auth.page.AccountFields; +import org.jboss.arquillian.graphene.page.Page; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdateEmailPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdateEmailPage.java index 46fce2cf5ab..023a6beaf3d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdateEmailPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdateEmailPage.java @@ -16,15 +16,16 @@ */ package org.keycloak.testsuite.auth.page.login; -import static org.keycloak.testsuite.util.UIUtils.clickLink; -import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; - import org.keycloak.models.UserModel; import org.keycloak.testsuite.pages.LogoutSessionsPage; + import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; +import static org.keycloak.testsuite.util.UIUtils.clickLink; +import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; + public class UpdateEmailPage extends LogoutSessionsPage { @FindBy(id = "email") diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdatePassword.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdatePassword.java index 1ce40dc9ee7..a8d535a9d4a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdatePassword.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/UpdatePassword.java @@ -17,10 +17,11 @@ package org.keycloak.testsuite.auth.page.login; -import org.jboss.arquillian.graphene.page.Page; import org.keycloak.models.UserModel; import org.keycloak.testsuite.auth.page.PasswordFields; +import org.jboss.arquillian.graphene.page.Page; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/VerifyEmail.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/VerifyEmail.java index 78178828c5c..4cfb30179ce 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/VerifyEmail.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/auth/page/login/VerifyEmail.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.auth.page.login; import org.keycloak.models.UserModel; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/broker/util/SimpleHttpDefault.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/broker/util/SimpleHttpDefault.java index eb6a835276b..86174ed7a8e 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/broker/util/SimpleHttpDefault.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/broker/util/SimpleHttpDefault.java @@ -17,10 +17,11 @@ package org.keycloak.testsuite.broker.util; -import org.apache.http.client.HttpClient; import org.keycloak.http.simple.SimpleHttp; import org.keycloak.http.simple.SimpleHttpRequest; +import org.apache.http.client.HttpClient; + /** * This class provides additional builders used in tests to create instances of SimpleHttpTest with a default length response size set. * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/KcAdmExec.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/KcAdmExec.java index 636711cbb38..715630c2454 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/KcAdmExec.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/KcAdmExec.java @@ -1,13 +1,13 @@ package org.keycloak.testsuite.cli; +import java.io.InputStream; +import java.util.List; + import org.keycloak.common.crypto.FipsMode; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.cli.exec.AbstractExec; import org.keycloak.testsuite.cli.exec.AbstractExecBuilder; -import java.io.InputStream; -import java.util.List; - /** * @author Marko Strukelj */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/KcRegExec.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/KcRegExec.java index b6926ceedde..a0ec0283fff 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/KcRegExec.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/KcRegExec.java @@ -1,13 +1,13 @@ package org.keycloak.testsuite.cli; +import java.io.InputStream; +import java.util.List; + import org.keycloak.common.crypto.FipsMode; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.cli.exec.AbstractExec; import org.keycloak.testsuite.cli.exec.AbstractExecBuilder; -import java.io.InputStream; -import java.util.List; - /** * @author Marko Strukelj */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/exec/AbstractExec.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/exec/AbstractExec.java index 42eda58f73f..5ee682cc715 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/exec/AbstractExec.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/cli/exec/AbstractExec.java @@ -1,9 +1,5 @@ package org.keycloak.testsuite.cli.exec; -import org.keycloak.client.cli.util.OsUtil; -import org.keycloak.testsuite.cli.OsArch; -import org.keycloak.testsuite.cli.OsUtils; - import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -17,6 +13,10 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import org.keycloak.client.cli.util.OsUtil; +import org.keycloak.testsuite.cli.OsArch; +import org.keycloak.testsuite.cli.OsUtils; + /** * @author Marko Strukelj */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/KeycloakTestingClient.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/KeycloakTestingClient.java index f018403db2c..0b37f7df013 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/KeycloakTestingClient.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/KeycloakTestingClient.java @@ -17,12 +17,10 @@ package org.keycloak.testsuite.client; +import java.util.Set; + import jakarta.ws.rs.core.Response; -import org.jboss.resteasy.client.jaxrs.ResteasyClient; -import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; -import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; -import org.junit.Assert; -import org.junit.AssumptionViolatedException; + import org.keycloak.common.Profile; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.client.resources.TestApplicationResource; @@ -37,7 +35,11 @@ import org.keycloak.testsuite.runonserver.SerializationUtil; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.util.JsonSerialization; -import java.util.Set; +import org.jboss.resteasy.client.jaxrs.ResteasyClient; +import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; +import org.jboss.resteasy.client.jaxrs.ResteasyWebTarget; +import org.junit.Assert; +import org.junit.AssumptionViolatedException; /** * @author Marko Strukelj diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResource.java index 698741083eb..c83e375ccff 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResource.java @@ -17,18 +17,18 @@ package org.keycloak.testsuite.client.resources; -import org.keycloak.representations.LogoutToken; -import org.keycloak.representations.adapters.action.LogoutAction; -import org.keycloak.representations.adapters.action.PushNotBeforeAction; -import org.keycloak.representations.adapters.action.TestAvailabilityAction; -import org.keycloak.utils.MediaType; - import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; +import org.keycloak.representations.LogoutToken; +import org.keycloak.representations.adapters.action.LogoutAction; +import org.keycloak.representations.adapters.action.PushNotBeforeAction; +import org.keycloak.representations.adapters.action.TestAvailabilityAction; +import org.keycloak.utils.MediaType; + /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResourceUrls.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResourceUrls.java index f35ab7c51f0..984c804f81f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResourceUrls.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestApplicationResourceUrls.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.client.resources; -import org.keycloak.testsuite.util.oauth.OAuthClient; - import jakarta.ws.rs.core.UriBuilder; +import org.keycloak.testsuite.util.oauth.OAuthClient; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestExampleCompanyResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestExampleCompanyResource.java index c065a30e611..b7b06af74a0 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestExampleCompanyResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestExampleCompanyResource.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.client.resources; -import org.keycloak.testsuite.domainextension.CompanyRepresentation; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DELETE; @@ -28,7 +28,8 @@ import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import java.util.List; + +import org.keycloak.testsuite.domainextension.CompanyRepresentation; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java index 58dbe81e003..10a4c320042 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java @@ -17,11 +17,8 @@ package org.keycloak.testsuite.client.resources; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.jose.jwk.JSONWebKeySet; -import org.keycloak.protocol.oidc.grants.ciba.endpoints.ClientNotificationEndpointRequest; -import org.keycloak.services.clientpolicy.executor.IntentClientBindCheckExecutor; -import org.keycloak.testsuite.rest.representation.TestAuthenticationChannelRequest; +import java.util.List; +import java.util.Map; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -33,8 +30,12 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Map; +import org.keycloak.jose.jwk.JSONWebKeySet; +import org.keycloak.protocol.oidc.grants.ciba.endpoints.ClientNotificationEndpointRequest; +import org.keycloak.services.clientpolicy.executor.IntentClientBindCheckExecutor; +import org.keycloak.testsuite.rest.representation.TestAuthenticationChannelRequest; + +import org.jboss.resteasy.reactive.NoCache; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestSamlApplicationResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestSamlApplicationResource.java index 8c441c05cc1..f6536b19fcc 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestSamlApplicationResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestSamlApplicationResource.java @@ -17,16 +17,16 @@ package org.keycloak.testsuite.client.resources; -import org.keycloak.representations.adapters.action.LogoutAction; -import org.keycloak.representations.adapters.action.PushNotBeforeAction; -import org.keycloak.representations.adapters.action.TestAvailabilityAction; -import org.keycloak.utils.MediaType; - import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; +import org.keycloak.representations.adapters.action.LogoutAction; +import org.keycloak.representations.adapters.action.PushNotBeforeAction; +import org.keycloak.representations.adapters.action.TestAvailabilityAction; +import org.keycloak.utils.MediaType; + /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingCacheResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingCacheResource.java index 99e6e1044cf..e2d96949243 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingCacheResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingCacheResource.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.client.resources; -import org.keycloak.utils.MediaType; +import java.util.Set; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -25,7 +25,8 @@ import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; -import java.util.Set; + +import org.keycloak.utils.MediaType; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingExportImportResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingExportImportResource.java index e83e1622cd4..9d0a3c6a444 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingExportImportResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingExportImportResource.java @@ -24,6 +24,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.MediaType; + import org.keycloak.exportimport.Strategy; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java index 11a3af455e0..cf09a62d203 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java @@ -17,17 +17,9 @@ package org.keycloak.testsuite.client.resources; -import org.jboss.resteasy.reactive.NoCache; -import org.keycloak.common.Profile; -import org.keycloak.common.enums.HostnameVerificationPolicy; -import org.keycloak.events.EventType; -import org.keycloak.protocol.oidc.encode.AccessTokenContext; -import org.keycloak.representations.idm.AdminEventRepresentation; -import org.keycloak.representations.idm.AuthenticationFlowRepresentation; -import org.keycloak.representations.idm.EventRepresentation; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.rest.representation.AuthenticatorState; -import org.keycloak.utils.MediaType; +import java.util.List; +import java.util.Map; +import java.util.Set; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; @@ -39,11 +31,19 @@ import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.keycloak.common.Profile; +import org.keycloak.common.enums.HostnameVerificationPolicy; +import org.keycloak.events.EventType; +import org.keycloak.protocol.oidc.encode.AccessTokenContext; +import org.keycloak.representations.idm.AdminEventRepresentation; +import org.keycloak.representations.idm.AuthenticationFlowRepresentation; +import org.keycloak.representations.idm.EventRepresentation; +import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.rest.representation.AuthenticatorState; +import org.keycloak.utils.MediaType; import org.infinispan.commons.time.TimeService; +import org.jboss.resteasy.reactive.NoCache; /** * @author Marko Strukelj diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/Different.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/Different.java index 606c7523269..dc78e30d5f2 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/Different.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/Different.java @@ -17,13 +17,13 @@ package org.keycloak.testsuite.drone; -import org.jboss.arquillian.drone.api.annotation.Qualifier; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.jboss.arquillian.drone.api.annotation.Qualifier; + /** * Taken from Drone example https://docs.jboss.org/author/display/ARQ/Drone * This allows you to have more than one instance of a Drone WebDriver. diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakDronePostSetup.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakDronePostSetup.java index 6223358d890..58a091f1cce 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakDronePostSetup.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakDronePostSetup.java @@ -17,8 +17,12 @@ package org.keycloak.testsuite.drone; +import java.io.File; +import java.net.MalformedURLException; import java.util.concurrent.TimeUnit; +import org.keycloak.testsuite.util.WaitUtils; + import org.jboss.arquillian.core.api.InstanceProducer; import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.core.api.annotation.Observes; @@ -30,7 +34,6 @@ import org.jboss.arquillian.graphene.proxy.Interceptor; import org.jboss.arquillian.graphene.proxy.InvocationContext; import org.jboss.arquillian.test.spi.annotation.ClassScoped; import org.jboss.logging.Logger; -import org.keycloak.testsuite.util.WaitUtils; import org.openqa.selenium.Capabilities; import org.openqa.selenium.WebDriver; import org.openqa.selenium.firefox.FirefoxDriver; @@ -38,9 +41,6 @@ import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.htmlunit.HtmlUnitDriver; import org.openqa.selenium.remote.RemoteWebDriver; -import java.io.File; -import java.net.MalformedURLException; - /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakWebDriverConfigurator.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakWebDriverConfigurator.java index b361785d5b5..096a7e37827 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakWebDriverConfigurator.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/drone/KeycloakWebDriverConfigurator.java @@ -17,6 +17,11 @@ package org.keycloak.testsuite.drone; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.jboss.arquillian.core.api.Instance; import org.jboss.arquillian.core.api.annotation.Inject; import org.jboss.arquillian.core.api.annotation.Observes; @@ -30,11 +35,6 @@ import org.openqa.selenium.Capabilities; import org.openqa.selenium.remote.CapabilityType; import org.openqa.selenium.remote.DesiredCapabilities; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - /** * @author Marek Posolda * @author Vaclav Muzikar diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java index fc215dc0362..44129eee7a4 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/model/StoreProvider.java @@ -17,13 +17,13 @@ package org.keycloak.testsuite.model; -import org.keycloak.utils.StringUtil; - import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; +import org.keycloak.utils.StringUtil; + /** * @author Martin Bartos */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPage.java index 569fe6afe54..c8de5a210e4 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPage.java @@ -17,18 +17,20 @@ package org.keycloak.testsuite.page; -import jakarta.ws.rs.core.UriBuilder; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.logging.Logger; -import org.junit.Assert; -import org.keycloak.testsuite.util.DroneUtils; -import org.keycloak.testsuite.util.URLUtils; -import org.openqa.selenium.WebDriver; - import java.net.URI; import java.util.HashMap; import java.util.Map; +import jakarta.ws.rs.core.UriBuilder; + +import org.keycloak.testsuite.util.DroneUtils; +import org.keycloak.testsuite.util.URLUtils; + +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.logging.Logger; +import org.junit.Assert; +import org.openqa.selenium.WebDriver; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPageWithInjectedUrl.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPageWithInjectedUrl.java index f1b91e41ba8..e6dd726b134 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPageWithInjectedUrl.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPageWithInjectedUrl.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.page; -import jakarta.ws.rs.core.UriBuilder; - import java.net.URISyntaxException; import java.net.URL; +import jakarta.ws.rs.core.UriBuilder; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPatternFlyAlert.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPatternFlyAlert.java index 719e44e6ee3..3f1e6437b34 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPatternFlyAlert.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/AbstractPatternFlyAlert.java @@ -17,6 +17,8 @@ package org.keycloak.testsuite.page; +import java.time.Duration; + import org.jboss.arquillian.drone.api.annotation.Drone; import org.jboss.logging.Logger; import org.openqa.selenium.By; @@ -27,17 +29,16 @@ import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import java.time.Duration; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.util.DroneUtils.getCurrentDriver; import static org.keycloak.testsuite.util.UIUtils.doesElementClassContain; import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; import static org.keycloak.testsuite.util.UIUtils.isElementVisible; import static org.keycloak.testsuite.util.WaitUtils.PAGELOAD_TIMEOUT_MILLIS; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/Form.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/Form.java index daf03896529..bf9d8f11dc8 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/Form.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/page/Form.java @@ -24,9 +24,10 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import static org.jboss.arquillian.graphene.Graphene.guardAjax; import static org.keycloak.testsuite.util.UIUtils.clickLink; +import static org.jboss.arquillian.graphene.Graphene.guardAjax; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AbstractPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AbstractPage.java index dcbe7170920..5a3695745b8 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AbstractPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AbstractPage.java @@ -17,9 +17,10 @@ package org.keycloak.testsuite.pages; +import org.keycloak.testsuite.util.oauth.OAuthClient; + import org.jboss.arquillian.test.api.ArquillianResource; import org.junit.Assert; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.openqa.selenium.WebDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java index 10b08594f1c..d262d8d7e87 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/AppPage.java @@ -19,11 +19,12 @@ package org.keycloak.testsuite.pages; import org.keycloak.testsuite.util.DroneUtils; import org.keycloak.testsuite.util.oauth.OAuthClient; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import static org.keycloak.testsuite.util.UIUtils.clickLink; import static org.keycloak.testsuite.util.ServerURLs.removeDefaultPorts; +import static org.keycloak.testsuite.util.UIUtils.clickLink; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/DeleteCredentialPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/DeleteCredentialPage.java index 200eb810a3e..6243fbd716b 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/DeleteCredentialPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/DeleteCredentialPage.java @@ -19,8 +19,9 @@ package org.keycloak.testsuite.pages; -import org.junit.Assert; import org.keycloak.testsuite.util.UIUtils; + +import org.junit.Assert; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/EmailUpdatePage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/EmailUpdatePage.java index b2764836dab..6e05d72b7bc 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/EmailUpdatePage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/EmailUpdatePage.java @@ -16,13 +16,13 @@ */ package org.keycloak.testsuite.pages; -import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; -import static org.keycloak.testsuite.util.UIUtils.isElementVisible; - import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; +import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; +import static org.keycloak.testsuite.util.UIUtils.isElementVisible; + public class EmailUpdatePage extends AbstractPage { @FindBy(id = "email") diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/EnterRecoveryAuthnCodePage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/EnterRecoveryAuthnCodePage.java index 06e23ca5f36..2227b82146c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/EnterRecoveryAuthnCodePage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/EnterRecoveryAuthnCodePage.java @@ -1,6 +1,7 @@ package org.keycloak.testsuite.pages; import org.keycloak.testsuite.util.UIUtils; + import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.NoSuchElementException; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/ErrorPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/ErrorPage.java index 067979e40cb..236824991c6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/ErrorPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/ErrorPage.java @@ -16,9 +16,10 @@ */ package org.keycloak.testsuite.pages; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.UIUtils; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.arquillian.test.api.ArquillianResource; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/IdpConfirmLinkPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/IdpConfirmLinkPage.java index 493f2468987..4496700f8ff 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/IdpConfirmLinkPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/IdpConfirmLinkPage.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.pages; import org.keycloak.testsuite.util.UIUtils; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/IdpLinkActionPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/IdpLinkActionPage.java index fe7c33c1e3b..61e0b68deae 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/IdpLinkActionPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/IdpLinkActionPage.java @@ -19,8 +19,9 @@ package org.keycloak.testsuite.pages; -import org.junit.Assert; import org.keycloak.testsuite.util.UIUtils; + +import org.junit.Assert; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InfoPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InfoPage.java index 9c936ef5175..e4fc8306b5a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InfoPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InfoPage.java @@ -17,10 +17,11 @@ package org.keycloak.testsuite.pages; -import org.jboss.arquillian.test.api.ArquillianResource; import org.keycloak.testsuite.util.DroneUtils; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.UIUtils; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.arquillian.test.api.ArquillianResource; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InstalledAppRedirectPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InstalledAppRedirectPage.java index ca42e0cf51e..f10ea30cdf8 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InstalledAppRedirectPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/InstalledAppRedirectPage.java @@ -22,10 +22,11 @@ package org.keycloak.testsuite.pages; import java.net.URI; import java.net.URISyntaxException; -import org.junit.Assert; import org.keycloak.OAuth2Constants; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.services.Urls; + +import org.junit.Assert; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LanguageComboboxAwarePage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LanguageComboboxAwarePage.java index d20e8d5d55d..5490c509e0d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LanguageComboboxAwarePage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LanguageComboboxAwarePage.java @@ -19,10 +19,12 @@ package org.keycloak.testsuite.pages; import java.net.URI; import java.net.URISyntaxException; -import org.junit.Assert; + import org.keycloak.testsuite.util.DroneUtils; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.WaitUtils; + +import org.junit.Assert; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebDriver; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java index cf13c02fada..95c68786b5e 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginConfigTotpPage.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.pages; import org.keycloak.testsuite.util.UIUtils; + import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPage.java index d99d57db2e6..4058afc1fe5 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPage.java @@ -17,12 +17,13 @@ package org.keycloak.testsuite.pages; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Assert; import org.keycloak.testsuite.util.DroneUtils; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.WaitUtils; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.Assert; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java index 58c79feee6c..aca7c2a0b81 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPasswordResetPage.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.pages; import org.keycloak.testsuite.util.UIUtils; + import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java index 6024118d52a..6d5b330b37c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginPasswordUpdatePage.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.pages; import org.keycloak.testsuite.util.UIUtils; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginTotpPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginTotpPage.java index 6593ad24dcd..df9fcc192c2 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginTotpPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginTotpPage.java @@ -19,9 +19,10 @@ package org.keycloak.testsuite.pages; import java.util.List; import java.util.stream.Collectors; -import org.junit.Assert; import org.keycloak.common.util.Retry; import org.keycloak.testsuite.util.UIUtils; + +import org.junit.Assert; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java index ace1b08c518..a51d9c57a93 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginUpdateProfilePage.java @@ -17,21 +17,22 @@ package org.keycloak.testsuite.pages; -import static org.keycloak.testsuite.util.UIUtils.clickLink; -import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; - import java.util.LinkedHashMap; import java.util.Map; -import org.jboss.arquillian.graphene.page.Page; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.WaitUtils; + +import org.jboss.arquillian.graphene.page.Page; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.TimeoutException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; +import static org.keycloak.testsuite.util.UIUtils.clickLink; +import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; + /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginUsernameOnlyPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginUsernameOnlyPage.java index 911ca999637..dd4772f9b14 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginUsernameOnlyPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LoginUsernameOnlyPage.java @@ -1,6 +1,7 @@ package org.keycloak.testsuite.pages; import org.keycloak.testsuite.util.UIUtils; + import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LogoutConfirmPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LogoutConfirmPage.java index 52305af90aa..ea6b3c033a0 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LogoutConfirmPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LogoutConfirmPage.java @@ -19,6 +19,7 @@ package org.keycloak.testsuite.pages; import org.keycloak.testsuite.util.UIUtils; + import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LogoutSessionsPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LogoutSessionsPage.java index e5eec94fe84..75cb9f8bf18 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LogoutSessionsPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/LogoutSessionsPage.java @@ -16,8 +16,9 @@ */ package org.keycloak.testsuite.pages; -import org.junit.Assert; import org.keycloak.testsuite.util.UIUtils; + +import org.junit.Assert; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/PasswordPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/PasswordPage.java index 96e9c70ca39..8ba382293ef 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/PasswordPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/PasswordPage.java @@ -1,8 +1,9 @@ package org.keycloak.testsuite.pages; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.UIUtils; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.arquillian.test.api.ArquillianResource; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/PushTheButtonPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/PushTheButtonPage.java index 08ce26d6cde..62b9f0a5ceb 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/PushTheButtonPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/PushTheButtonPage.java @@ -20,6 +20,7 @@ package org.keycloak.testsuite.pages; import org.keycloak.testsuite.util.DroneUtils; import org.keycloak.testsuite.util.UIUtils; + import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/RegisterPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/RegisterPage.java index 7ba4f5440a6..8f4b71761c1 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/RegisterPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/RegisterPage.java @@ -20,13 +20,14 @@ package org.keycloak.testsuite.pages; import java.util.Map; import java.util.Map.Entry; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; import org.keycloak.models.Constants; import org.keycloak.testsuite.auth.page.AccountFields; import org.keycloak.testsuite.auth.page.PasswordFields; import org.keycloak.testsuite.util.DroneUtils; import org.keycloak.testsuite.util.UIUtils; + +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/ResetOtpPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/ResetOtpPage.java index fc6e7f9543b..89e389e348f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/ResetOtpPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/ResetOtpPage.java @@ -1,6 +1,7 @@ package org.keycloak.testsuite.pages; import org.keycloak.testsuite.util.UIUtils; + import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SelectAuthenticatorPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SelectAuthenticatorPage.java index 46a92f85d8a..395f53cbf31 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SelectAuthenticatorPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SelectAuthenticatorPage.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.stream.Collectors; import org.keycloak.testsuite.util.DroneUtils; + import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SelectOrganizationPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SelectOrganizationPage.java index 0c5011c0038..9b062e214ae 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SelectOrganizationPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SelectOrganizationPage.java @@ -17,17 +17,18 @@ package org.keycloak.testsuite.pages; -import static org.keycloak.testsuite.util.UIUtils.clickLink; +import org.keycloak.testsuite.util.DroneUtils; +import org.keycloak.testsuite.util.oauth.OAuthClient; import org.jboss.arquillian.test.api.ArquillianResource; import org.junit.Assert; -import org.keycloak.testsuite.util.DroneUtils; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; +import static org.keycloak.testsuite.util.UIUtils.clickLink; + public class SelectOrganizationPage extends LanguageComboboxAwarePage { @ArquillianResource diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SetupRecoveryAuthnCodesPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SetupRecoveryAuthnCodesPage.java index f96d9265f41..b86ebf4891a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SetupRecoveryAuthnCodesPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/SetupRecoveryAuthnCodesPage.java @@ -1,16 +1,17 @@ package org.keycloak.testsuite.pages; +import java.util.ArrayList; +import java.util.List; +import java.util.Scanner; + import org.keycloak.testsuite.util.UIUtils; + import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import java.util.ArrayList; -import java.util.List; -import java.util.Scanner; - public class SetupRecoveryAuthnCodesPage extends LogoutSessionsPage { @FindBy(id = "kc-recovery-codes-list") diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/TermsAndConditionsPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/TermsAndConditionsPage.java index 4c9a9767285..3d1af8bf90c 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/TermsAndConditionsPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/TermsAndConditionsPage.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.pages; import org.keycloak.testsuite.util.UIUtils; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/VerifyEmailPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/VerifyEmailPage.java index c6f6204f516..89a181c1f4b 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/VerifyEmailPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/VerifyEmailPage.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.pages; -import org.jboss.arquillian.test.api.ArquillianResource; import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.arquillian.test.api.ArquillianResource; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/VerifyProfilePage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/VerifyProfilePage.java index 8b9da3c959e..9cd93977a73 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/VerifyProfilePage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/VerifyProfilePage.java @@ -17,9 +17,10 @@ package org.keycloak.testsuite.pages; -import org.jboss.arquillian.graphene.page.Page; import org.keycloak.testsuite.auth.page.AccountFields; import org.keycloak.testsuite.util.UIUtils; + +import org.jboss.arquillian.graphene.page.Page; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/FacebookLoginPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/FacebookLoginPage.java index 65e50d23f9c..aec63783bea 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/FacebookLoginPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/FacebookLoginPage.java @@ -17,13 +17,13 @@ package org.keycloak.testsuite.pages.social; +import java.util.List; + import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import java.util.List; - /** * @author Vaclav Muzikar */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/GitHubLoginPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/GitHubLoginPage.java index a0ae844a246..6df11fe82e8 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/GitHubLoginPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/GitHubLoginPage.java @@ -19,6 +19,7 @@ package org.keycloak.testsuite.pages.social; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.URLUtils; + import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/GoogleLoginPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/GoogleLoginPage.java index 03cc12811e6..9838e2655e0 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/GoogleLoginPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/GoogleLoginPage.java @@ -17,12 +17,12 @@ package org.keycloak.testsuite.pages.social; +import java.util.List; + import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import java.util.List; - import static org.keycloak.testsuite.util.UIUtils.clickLink; import static org.keycloak.testsuite.util.URLUtils.navigateToUri; import static org.keycloak.testsuite.util.WaitUtils.pause; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/InstagramLoginPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/InstagramLoginPage.java index 98ebdd3cda3..e145d2137d7 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/InstagramLoginPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/InstagramLoginPage.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.pages.social; import org.keycloak.testsuite.util.WaitUtils; + import org.openqa.selenium.Keys; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/MicrosoftLoginPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/MicrosoftLoginPage.java index 075e06bba8d..9f6f6eed5c1 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/MicrosoftLoginPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/MicrosoftLoginPage.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.pages.social; import org.keycloak.testsuite.util.WaitUtils; + import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/OpenShiftLoginPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/OpenShiftLoginPage.java index a8839946970..eb36d492d80 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/OpenShiftLoginPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/OpenShiftLoginPage.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.pages.social; import org.keycloak.testsuite.util.WaitUtils; + import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.openqa.selenium.NoSuchElementException; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/PayPalLoginPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/PayPalLoginPage.java index 70923fe3906..f3b447641c5 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/PayPalLoginPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/PayPalLoginPage.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.pages.social; import org.keycloak.testsuite.util.WaitUtils; + import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/TwitterLoginPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/TwitterLoginPage.java index 12f4271b68a..7f457bc76d0 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/TwitterLoginPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/social/TwitterLoginPage.java @@ -17,12 +17,14 @@ package org.keycloak.testsuite.pages.social; +import java.util.List; + import org.keycloak.testsuite.util.WaitUtils; + import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import java.util.List; import static org.keycloak.testsuite.util.WaitUtils.pause; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/x509/X509IdentityConfirmationPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/x509/X509IdentityConfirmationPage.java index 86ed755c070..8fc4aca6f2c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/x509/X509IdentityConfirmationPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/pages/x509/X509IdentityConfirmationPage.java @@ -18,9 +18,10 @@ package org.keycloak.testsuite.pages.x509; -import org.jboss.arquillian.test.api.ArquillianResource; import org.keycloak.testsuite.pages.LanguageComboboxAwarePage; import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.arquillian.test.api.ArquillianResource; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/servlet/ApplicationServlet.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/servlet/ApplicationServlet.java index 5f074abeba2..e6da4904ed6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/servlet/ApplicationServlet.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/servlet/ApplicationServlet.java @@ -16,15 +16,16 @@ */ package org.keycloak.testsuite.servlet; -import org.keycloak.services.resources.RealmsResource; +import java.io.IOException; +import java.io.PrintWriter; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServlet; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.ws.rs.core.UriBuilder; -import java.io.IOException; -import java.io.PrintWriter; + +import org.keycloak.services.resources.RealmsResource; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/ClientAttributeUpdater.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/ClientAttributeUpdater.java index fd51199c88e..79ba0777083 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/ClientAttributeUpdater.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/ClientAttributeUpdater.java @@ -1,17 +1,18 @@ package org.keycloak.testsuite.updaters; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/Creator.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/Creator.java index 37ee0bd7546..a5e9fe0088f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/Creator.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/Creator.java @@ -16,6 +16,13 @@ */ package org.keycloak.testsuite.updaters; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.atomic.AtomicBoolean; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.ClientResource; @@ -38,17 +45,14 @@ import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.atomic.AtomicBoolean; -import jakarta.ws.rs.core.Response; + import org.hamcrest.Matchers; import org.jboss.logging.Logger; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.admin.ApiUtil.getCreatedId; +import static org.hamcrest.MatcherAssert.assertThat; + /** * Creates a temporary realm object and makes sure it is removed when used within try-with-resources. */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderAttributeUpdater.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderAttributeUpdater.java index f6a35cb9769..c824e263f51 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderAttributeUpdater.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderAttributeUpdater.java @@ -1,11 +1,12 @@ package org.keycloak.testsuite.updaters; -import org.keycloak.admin.client.resource.IdentityProviderResource; -import org.keycloak.representations.idm.IdentityProviderRepresentation; import java.io.Closeable; import java.util.HashMap; import java.util.Map; +import org.keycloak.admin.client.resource.IdentityProviderResource; +import org.keycloak.representations.idm.IdentityProviderRepresentation; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderCreator.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderCreator.java index ae813108aa5..027806107b6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderCreator.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/IdentityProviderCreator.java @@ -16,14 +16,16 @@ */ package org.keycloak.testsuite.updaters; +import java.io.Closeable; +import java.io.IOException; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.IdentityProvidersResource; -import java.io.Closeable; -import jakarta.ws.rs.NotFoundException; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import java.io.IOException; -import jakarta.ws.rs.core.Response; /** * Creates a temporary realm and makes sure it is removed. diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/ProtocolMappersUpdater.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/ProtocolMappersUpdater.java index 3ff8ba96af0..d4e6961907a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/ProtocolMappersUpdater.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/ProtocolMappersUpdater.java @@ -16,8 +16,6 @@ */ package org.keycloak.testsuite.updaters; -import org.keycloak.admin.client.resource.ProtocolMappersResource; -import org.keycloak.representations.idm.ProtocolMapperRepresentation; import java.util.Arrays; import java.util.Iterator; import java.util.List; @@ -25,6 +23,9 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.keycloak.admin.client.resource.ProtocolMappersResource; +import org.keycloak.representations.idm.ProtocolMapperRepresentation; + /** * Updater for mappers. See {@link ServerResourceUpdater} for further details. * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/RealmAttributeUpdater.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/RealmAttributeUpdater.java index ca5720ac3ff..454baba3f3c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/RealmAttributeUpdater.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/RealmAttributeUpdater.java @@ -1,13 +1,13 @@ package org.keycloak.testsuite.updaters; -import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.representations.idm.RealmRepresentation; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; +import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.representations.idm.RealmRepresentation; + /** * Updater for realm attributes. See {@link ServerResourceUpdater} for further details. * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/RoleScopeUpdater.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/RoleScopeUpdater.java index 5f9e2628d43..580b96f794b 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/RoleScopeUpdater.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/RoleScopeUpdater.java @@ -16,13 +16,14 @@ */ package org.keycloak.testsuite.updaters; -import org.keycloak.admin.client.resource.RoleScopeResource; -import org.keycloak.representations.idm.RoleRepresentation; import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.admin.client.resource.RoleScopeResource; +import org.keycloak.representations.idm.RoleRepresentation; + /** * Updater for role scope attributes. See {@link ServerResourceUpdater} for further details. * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/UserAttributeUpdater.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/UserAttributeUpdater.java index 76bbe3c2bf0..09f036a67c5 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/UserAttributeUpdater.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/updaters/UserAttributeUpdater.java @@ -1,5 +1,12 @@ package org.keycloak.testsuite.updaters; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; @@ -7,16 +14,12 @@ import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.MatcherAssert.assertThat; + import static org.keycloak.testsuite.updaters.ServerResourceUpdater.updateViaAddRemove; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; + /** * Updater for user attributes. See {@link ServerResourceUpdater} for further details. * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/AdminClientUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/AdminClientUtil.java index ef85716df21..aab5ddf05c0 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/AdminClientUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/AdminClientUtil.java @@ -26,12 +26,16 @@ import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; - +import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; +import org.keycloak.OAuth2Constants; +import org.keycloak.admin.client.Keycloak; +import org.keycloak.admin.client.KeycloakBuilder; +import org.keycloak.models.Constants; + import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import javax.net.ssl.HostnameVerifier; import org.apache.http.HttpHost; import org.apache.http.client.config.RequestConfig; import org.apache.http.conn.HttpClientConnectionManager; @@ -42,15 +46,11 @@ import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; import org.jboss.resteasy.client.jaxrs.engines.ClientHttpEngineBuilder43; import org.jboss.resteasy.plugins.providers.jackson.ResteasyJackson2Provider; -import org.keycloak.OAuth2Constants; -import org.keycloak.admin.client.Keycloak; -import org.keycloak.admin.client.KeycloakBuilder; -import org.keycloak.models.Constants; import static org.keycloak.testsuite.auth.page.AuthRealm.ADMIN; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; -import static org.keycloak.testsuite.utils.io.IOUtil.PROJECT_BUILD_DIRECTORY; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; +import static org.keycloak.testsuite.utils.io.IOUtil.PROJECT_BUILD_DIRECTORY; public class AdminClientUtil { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ArtifactResolutionService.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ArtifactResolutionService.java index 408bfec50e7..0eecc209742 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ArtifactResolutionService.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ArtifactResolutionService.java @@ -1,5 +1,23 @@ package org.keycloak.testsuite.util; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.StringWriter; +import java.nio.charset.StandardCharsets; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +import jakarta.xml.ws.Endpoint; +import jakarta.xml.ws.Provider; +import jakarta.xml.ws.Service; +import jakarta.xml.ws.ServiceMode; +import jakarta.xml.ws.WebServiceProvider; +import jakarta.xml.ws.http.HTTPBinding; + import org.keycloak.dom.saml.v2.protocol.ArtifactResolveType; import org.keycloak.dom.saml.v2.protocol.ArtifactResponseType; import org.keycloak.protocol.saml.SamlProtocolUtils; @@ -10,24 +28,8 @@ import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; -import org.w3c.dom.Document; -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; -import jakarta.xml.ws.Endpoint; -import jakarta.xml.ws.Provider; -import jakarta.xml.ws.Service; -import jakarta.xml.ws.ServiceMode; -import jakarta.xml.ws.WebServiceProvider; -import jakarta.xml.ws.http.HTTPBinding; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.StringWriter; -import java.nio.charset.StandardCharsets; +import org.w3c.dom.Document; /** * This class simulates a service provider's (clients's) Artifact Resolution Service. It is a webservice provider diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/BrowserTabUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/BrowserTabUtil.java index 5f91394bb5e..2a1c75c43e5 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/BrowserTabUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/BrowserTabUtil.java @@ -17,16 +17,16 @@ package org.keycloak.testsuite.util; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + import org.htmlunit.WebClient; import org.jboss.arquillian.drone.webdriver.htmlunit.DroneHtmlUnitDriver; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebDriver; import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - /** * Helper class for managing tabs in browser. * Tabs are indexed from 0. (f.e. first tab has index 0) diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ContainerAssume.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ContainerAssume.java index a8728cd1bd3..74d0ce61f11 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ContainerAssume.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/ContainerAssume.java @@ -17,9 +17,10 @@ package org.keycloak.testsuite.util; +import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; + import org.jboss.logging.Logger; import org.junit.Assume; -import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.APP_SERVER_SSL_REQUIRED; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/CryptoInitRule.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/CryptoInitRule.java index a818ffe47d3..86e9235fe65 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/CryptoInitRule.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/CryptoInitRule.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.util; -import org.junit.rules.ExternalResource; import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.crypto.CryptoProvider; +import org.junit.rules.ExternalResource; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/DroneUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/DroneUtils.java index 1c94f7250c9..8eb48043764 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/DroneUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/DroneUtils.java @@ -17,11 +17,6 @@ package org.keycloak.testsuite.util; -import org.jboss.arquillian.graphene.context.GrapheneContext; -import org.jboss.arquillian.graphene.page.Page; -import org.keycloak.testsuite.page.AbstractPage; -import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.openqa.selenium.WebDriver; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Arrays; @@ -29,6 +24,13 @@ import java.util.LinkedList; import java.util.List; import java.util.Queue; +import org.keycloak.testsuite.page.AbstractPage; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.arquillian.graphene.context.GrapheneContext; +import org.jboss.arquillian.graphene.page.Page; +import org.openqa.selenium.WebDriver; + /** * @author Vaclav Muzikar */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java index 64418a11391..75f764337d3 100755 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/GreenMailRule.java @@ -17,17 +17,19 @@ package org.keycloak.testsuite.util; -import com.icegreen.greenmail.util.GreenMail; -import com.icegreen.greenmail.util.ServerSetup; -import org.junit.rules.ExternalResource; -import org.keycloak.models.RealmModel; - -import jakarta.mail.internet.MimeMessage; import java.lang.Thread.UncaughtExceptionHandler; import java.net.SocketException; import java.util.HashMap; import java.util.Map; +import jakarta.mail.internet.MimeMessage; + +import org.keycloak.models.RealmModel; + +import com.icegreen.greenmail.util.GreenMail; +import com.icegreen.greenmail.util.ServerSetup; +import org.junit.rules.ExternalResource; + /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/HtmlUnitBrowser.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/HtmlUnitBrowser.java index 82a4dcb21bb..9217a661f5a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/HtmlUnitBrowser.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/HtmlUnitBrowser.java @@ -16,13 +16,13 @@ */ package org.keycloak.testsuite.util; -import org.jboss.arquillian.drone.api.annotation.Qualifier; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.jboss.arquillian.drone.api.annotation.Qualifier; + @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.FIELD, ElementType.PARAMETER}) @Qualifier diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/JavascriptBrowser.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/JavascriptBrowser.java index 687d95126e6..77ca70e9627 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/JavascriptBrowser.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/JavascriptBrowser.java @@ -16,13 +16,13 @@ */ package org.keycloak.testsuite.util; -import org.jboss.arquillian.drone.api.annotation.Qualifier; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.jboss.arquillian.drone.api.annotation.Qualifier; + /** * * @author Petr Mensik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KerberosRule.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KerberosRule.java index b6e108f78d0..62090a34654 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KerberosRule.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KerberosRule.java @@ -21,11 +21,12 @@ import java.io.File; import java.net.URL; import java.util.Properties; -import org.jboss.logging.Logger; -import org.keycloak.testsuite.client.resources.TestingResource; import org.keycloak.testsuite.KerberosEmbeddedServer; +import org.keycloak.testsuite.client.resources.TestingResource; import org.keycloak.util.ldap.LDAPEmbeddedServer; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KeyUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KeyUtils.java index b788904a649..f97c985351d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KeyUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KeyUtils.java @@ -1,22 +1,5 @@ package org.keycloak.testsuite.util; -import jakarta.ws.rs.core.Response; -import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.BouncyIntegration; -import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.crypto.JavaAlgorithm; -import org.keycloak.crypto.KeyStatus; -import org.keycloak.crypto.KeyType; -import org.keycloak.crypto.KeyUse; -import org.keycloak.keys.AbstractEcKeyProviderFactory; -import org.keycloak.keys.GeneratedEcdhKeyProviderFactory; -import org.keycloak.keys.GeneratedEcdsaKeyProviderFactory; -import org.keycloak.keys.KeyProvider; -import org.keycloak.representations.idm.ComponentRepresentation; -import org.keycloak.representations.idm.KeysMetadataRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; - import java.security.InvalidAlgorithmParameterException; import java.security.KeyFactory; import java.security.KeyPair; @@ -35,6 +18,24 @@ import java.util.stream.Stream; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; +import jakarta.ws.rs.core.Response; + +import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.BouncyIntegration; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.crypto.JavaAlgorithm; +import org.keycloak.crypto.KeyStatus; +import org.keycloak.crypto.KeyType; +import org.keycloak.crypto.KeyUse; +import org.keycloak.keys.AbstractEcKeyProviderFactory; +import org.keycloak.keys.GeneratedEcdhKeyProviderFactory; +import org.keycloak.keys.GeneratedEcdsaKeyProviderFactory; +import org.keycloak.keys.KeyProvider; +import org.keycloak.representations.idm.ComponentRepresentation; +import org.keycloak.representations.idm.KeysMetadataRepresentation; +import org.keycloak.testsuite.admin.ApiUtil; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KeystoreUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KeystoreUtils.java index a15d56d6184..9815641ddbf 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KeystoreUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/KeystoreUtils.java @@ -19,15 +19,6 @@ package org.keycloak.testsuite.util; -import org.junit.Assume; -import org.junit.rules.TemporaryFolder; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.CertificateUtils; -import org.keycloak.common.util.KeyUtils; -import org.keycloak.common.util.KeystoreUtil; -import org.keycloak.common.util.PemUtils; -import org.keycloak.representations.idm.CertificateRepresentation; - import java.io.File; import java.io.FileOutputStream; import java.security.KeyPair; @@ -39,6 +30,16 @@ import java.util.Arrays; import java.util.stream.Stream; import javax.crypto.SecretKey; +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.CertificateUtils; +import org.keycloak.common.util.KeyUtils; +import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.common.util.PemUtils; +import org.keycloak.representations.idm.CertificateRepresentation; + +import org.junit.Assume; +import org.junit.rules.TemporaryFolder; + import static org.junit.Assert.fail; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LDAPRule.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LDAPRule.java index 41116dfdeb7..3dcddcab426 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LDAPRule.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/LDAPRule.java @@ -17,14 +17,6 @@ package org.keycloak.testsuite.util; -import org.jboss.logging.Logger; -import org.junit.Assume; -import org.junit.runners.model.Statement; -import org.junit.runner.Description; -import org.junit.rules.ExternalResource; -import org.keycloak.models.LDAPConstants; -import org.keycloak.util.ldap.LDAPEmbeddedServer; - import java.io.File; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; @@ -34,6 +26,15 @@ import java.lang.annotation.Target; import java.util.Map; import java.util.Properties; +import org.keycloak.models.LDAPConstants; +import org.keycloak.util.ldap.LDAPEmbeddedServer; + +import org.jboss.logging.Logger; +import org.junit.Assume; +import org.junit.rules.ExternalResource; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + import static org.keycloak.testsuite.utils.io.IOUtil.PROJECT_BUILD_DIRECTORY; /** 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 685c772ecde..837af016c32 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 @@ -17,13 +17,6 @@ package org.keycloak.testsuite.util; -import org.apache.commons.configuration.PropertiesConfiguration; -import org.jboss.logging.Logger; -import org.keycloak.common.constants.GenericConstants; -import org.keycloak.common.constants.KerberosConstants; -import org.keycloak.models.LDAPConstants; -import org.keycloak.storage.UserStorageProvider; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -32,6 +25,14 @@ import java.net.URL; import java.util.HashMap; import java.util.Map; +import org.keycloak.common.constants.GenericConstants; +import org.keycloak.common.constants.KerberosConstants; +import org.keycloak.models.LDAPConstants; +import org.keycloak.storage.UserStorageProvider; + +import org.apache.commons.configuration.PropertiesConfiguration; +import org.jboss.logging.Logger; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java index c4f3be70582..dab44e401db 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MailUtils.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.util; +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import jakarta.mail.Address; import jakarta.mail.MessagingException; import jakarta.mail.Multipart; import jakarta.mail.internet.MimeMessage; -import java.io.IOException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Matchers.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Matchers.java index 5b3bede0edd..c606c49192b 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Matchers.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Matchers.java @@ -16,6 +16,12 @@ */ package org.keycloak.testsuite.util; +import java.net.URI; +import java.util.Arrays; +import java.util.Map; + +import jakarta.ws.rs.core.Response; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; @@ -31,12 +37,9 @@ import org.keycloak.testsuite.util.matchers.SamlLogoutRequestTypeMatcher; import org.keycloak.testsuite.util.matchers.SamlResponseTypeMatcher; import org.keycloak.testsuite.util.matchers.SamlStatusResponseTypeMatcher; -import java.net.URI; -import java.util.Arrays; -import java.util.Map; -import jakarta.ws.rs.core.Response; import org.apache.http.HttpResponse; import org.hamcrest.Matcher; + import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java index 25c3a499c66..4aa0e4103c3 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerFactoryImpl.java @@ -1,13 +1,5 @@ package org.keycloak.testsuite.util; -import org.subethamail.smtp.MessageContext; -import org.subethamail.smtp.MessageHandler; -import org.subethamail.smtp.MessageHandlerFactory; -import org.subethamail.smtp.RejectException; - -import jakarta.mail.MessagingException; -import jakarta.mail.Session; -import jakarta.mail.internet.MimeMessage; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -15,6 +7,15 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.Properties; +import jakarta.mail.MessagingException; +import jakarta.mail.Session; +import jakarta.mail.internet.MimeMessage; + +import org.subethamail.smtp.MessageContext; +import org.subethamail.smtp.MessageHandler; +import org.subethamail.smtp.MessageHandlerFactory; +import org.subethamail.smtp.RejectException; + public class MessageHandlerFactoryImpl implements MessageHandlerFactory { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerImpl.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerImpl.java index ec6d4302762..0538bb3b64c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerImpl.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MessageHandlerImpl.java @@ -1,11 +1,11 @@ package org.keycloak.testsuite.util; +import java.io.InputStream; + import org.jboss.logging.Logger; import org.subethamail.smtp.MessageContext; import org.subethamail.smtp.MessageHandler; -import java.io.InputStream; - public class MessageHandlerImpl implements MessageHandler { MessageContext context; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MutualTLSUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MutualTLSUtils.java index 01a9f51ceee..89d8ed8f1ad 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MutualTLSUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/MutualTLSUtils.java @@ -1,17 +1,5 @@ package org.keycloak.testsuite.util; -import org.apache.http.client.RedirectStrategy; -import org.apache.http.conn.ssl.NoopHostnameVerifier; -import org.apache.http.conn.ssl.SSLConnectionSocketFactory; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultRedirectStrategy; -import org.apache.http.impl.client.HttpClientBuilder; -import org.keycloak.common.util.Base64Url; -import org.keycloak.common.util.KeystoreUtil; - -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManagerFactory; import java.security.KeyManagementException; import java.security.KeyStore; import java.security.KeyStoreException; @@ -21,6 +9,19 @@ import java.security.UnrecoverableKeyException; import java.security.cert.CertificateEncodingException; import java.security.cert.X509Certificate; import java.util.Enumeration; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManagerFactory; + +import org.keycloak.common.util.Base64Url; +import org.keycloak.common.util.KeystoreUtil; + +import org.apache.http.client.RedirectStrategy; +import org.apache.http.conn.ssl.NoopHostnameVerifier; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.DefaultRedirectStrategy; +import org.apache.http.impl.client.HttpClientBuilder; /** * Utilities for Holder of key mechanism and other Mutual TLS tests. diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java index bddf11445eb..7fe6fe93764 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClient.java @@ -16,25 +16,36 @@ */ package org.keycloak.testsuite.util; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.client.utils.URLEncodedUtils; -import org.apache.http.entity.ByteArrayEntity; -import org.apache.http.entity.ContentType; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.impl.client.LaxRedirectStrategy; -import org.apache.http.message.BasicNameValuePair; -import org.apache.http.util.EntityUtils; -import org.jboss.logging.Logger; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.security.Key; +import java.security.KeyManagementException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.cert.X509Certificate; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPBody; +import jakarta.xml.soap.SOAPEnvelope; +import jakarta.xml.soap.SOAPException; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.soap.SOAPHeaderElement; +import jakarta.xml.soap.SOAPMessage; +import jakarta.xml.ws.soap.SOAPFaultException; + import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.common.VerificationException; import org.keycloak.common.util.KeyUtils; @@ -62,46 +73,38 @@ import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.saml.processing.core.util.JAXPValidationUtil; import org.keycloak.saml.processing.web.util.RedirectBindingUtil; import org.keycloak.testsuite.util.saml.StepWithCheckers; + +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.http.entity.ByteArrayEntity; +import org.apache.http.entity.ContentType; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.impl.client.LaxRedirectStrategy; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; +import org.jboss.logging.Logger; +import org.jsoup.Jsoup; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; import org.w3c.dom.Document; import org.w3c.dom.Node; -import jakarta.ws.rs.core.MultivaluedHashMap; -import jakarta.ws.rs.core.MultivaluedMap; -import jakarta.ws.rs.core.Response; -import jakarta.xml.soap.MessageFactory; -import jakarta.xml.soap.SOAPBody; -import jakarta.xml.soap.SOAPEnvelope; -import jakarta.xml.soap.SOAPException; -import jakarta.xml.soap.SOAPHeader; -import jakarta.xml.soap.SOAPHeaderElement; -import jakarta.xml.soap.SOAPMessage; -import jakarta.xml.ws.soap.SOAPFaultException; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.security.Key; -import java.security.KeyManagementException; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.cert.X509Certificate; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; import static org.keycloak.saml.common.constants.GeneralConstants.RELAY_STATE; import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; import static org.keycloak.testsuite.util.SamlUtils.getSamlDeploymentForClient; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertTrue; + /** * @author hmlnarik */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClientBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClientBuilder.java index 6231b960ef8..6cae8f0471d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClientBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlClientBuilder.java @@ -16,6 +16,14 @@ */ package org.keycloak.testsuite.util; +import java.net.URI; +import java.util.LinkedList; +import java.util.List; +import java.util.function.Consumer; +import java.util.function.Function; + +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.testsuite.page.AbstractPage; @@ -23,30 +31,27 @@ import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClient.DoNotFollowRedirectStep; import org.keycloak.testsuite.util.SamlClient.ResultExtractor; import org.keycloak.testsuite.util.SamlClient.Step; -import java.net.URI; -import java.util.LinkedList; -import java.util.List; -import java.util.function.Consumer; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; import org.keycloak.testsuite.util.saml.CreateArtifactMessageStepBuilder; import org.keycloak.testsuite.util.saml.CreateAuthnRequestStepBuilder; import org.keycloak.testsuite.util.saml.CreateLogoutRequestStepBuilder; import org.keycloak.testsuite.util.saml.HandleArtifactStepBuilder; import org.keycloak.testsuite.util.saml.IdPInitiatedLoginBuilder; import org.keycloak.testsuite.util.saml.LoginBuilder; -import org.keycloak.testsuite.util.saml.UpdateProfileBuilder; import org.keycloak.testsuite.util.saml.ModifySamlResponseStepBuilder; import org.keycloak.testsuite.util.saml.RequiredConsentBuilder; -import java.util.function.Function; -import jakarta.ws.rs.core.Response.Status; +import org.keycloak.testsuite.util.saml.UpdateProfileBuilder; + +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpUriRequest; import org.hamcrest.Matcher; import org.w3c.dom.Document; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; + import static org.keycloak.testsuite.util.saml.SamlDocumentStepBuilder.saml2Object2String; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.notNullValue; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlStreams.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlStreams.java index ad91a1b348f..26c3391b48f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlStreams.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlStreams.java @@ -16,6 +16,9 @@ */ package org.keycloak.testsuite.util; +import java.util.Objects; +import java.util.stream.Stream; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; @@ -24,10 +27,9 @@ import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.dom.saml.v2.assertion.ConditionAbstractType; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.dom.saml.v2.protocol.ResponseType.RTChoiceType; -import java.util.Objects; -import java.util.stream.Stream; -import static org.hamcrest.Matchers.instanceOf; + import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlUtils.java index f623dcfcfa7..318c0026034 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SamlUtils.java @@ -1,6 +1,7 @@ package org.keycloak.testsuite.util; -import org.apache.tools.ant.filters.StringInputStream; +import java.io.InputStream; + import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.adapters.saml.config.parsers.DeploymentBuilder; import org.keycloak.adapters.saml.config.parsers.ResourceLoader; @@ -13,9 +14,9 @@ import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.processing.core.parsers.saml.SAMLParser; import org.keycloak.testsuite.utils.arquillian.DeploymentArchiveProcessorUtils; import org.keycloak.testsuite.utils.io.IOUtil; -import org.w3c.dom.Document; -import java.io.InputStream; +import org.apache.tools.ant.filters.StringInputStream; +import org.w3c.dom.Document; public class SamlUtils { public static SamlDeployment getSamlDeploymentForClient(String client) throws ParsingException { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SecondBrowser.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SecondBrowser.java index ceeb7f7b0b1..2a1c2df516f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SecondBrowser.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SecondBrowser.java @@ -16,13 +16,13 @@ */ package org.keycloak.testsuite.util; -import org.jboss.arquillian.drone.api.annotation.Qualifier; - import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.jboss.arquillian.drone.api.annotation.Qualifier; + /** * * @author Petr Mensik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SignatureSignerUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SignatureSignerUtil.java index 8ebfdd1443f..8e2bbec1ba8 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SignatureSignerUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SignatureSignerUtil.java @@ -1,13 +1,13 @@ package org.keycloak.testsuite.util; +import java.security.PrivateKey; + import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.AsymmetricSignatureSignerContext; import org.keycloak.crypto.KeyWrapper; import org.keycloak.crypto.ServerECDSASignatureSignerContext; import org.keycloak.crypto.SignatureSignerContext; -import java.security.PrivateKey; - public class SignatureSignerUtil { public static SignatureSignerContext createSigner(PrivateKey privateKey, String kid, String algorithm) { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SpiProvidersSwitchingUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SpiProvidersSwitchingUtils.java index b5f56d01b66..ce3bfdfd117 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SpiProvidersSwitchingUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SpiProvidersSwitchingUtils.java @@ -1,13 +1,5 @@ package org.keycloak.testsuite.util; -import org.jboss.arquillian.container.spi.Container; -import org.jboss.logging.Logger; -import org.keycloak.testsuite.arquillian.ContainerInfo; -import org.keycloak.testsuite.arquillian.SuiteContext; -import org.keycloak.testsuite.arquillian.annotation.SetDefaultProvider; -import org.keycloak.testsuite.arquillian.containers.AbstractQuarkusDeployableContainer; -import org.keycloak.utils.StringUtil; - import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -15,6 +7,15 @@ import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; +import org.keycloak.testsuite.arquillian.ContainerInfo; +import org.keycloak.testsuite.arquillian.SuiteContext; +import org.keycloak.testsuite.arquillian.annotation.SetDefaultProvider; +import org.keycloak.testsuite.arquillian.containers.AbstractQuarkusDeployableContainer; +import org.keycloak.utils.StringUtil; + +import org.jboss.arquillian.container.spi.Container; +import org.jboss.logging.Logger; + public class SpiProvidersSwitchingUtils { private static final String KEYCLOAKX_ARG_SPI_PREFIX = "--spi-"; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TestCleanup.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TestCleanup.java index 358ad1f5030..7bbeb265faa 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TestCleanup.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TestCleanup.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.util; import java.util.List; +import java.util.concurrent.ConcurrentLinkedDeque; import jakarta.ws.rs.NotFoundException; @@ -25,9 +26,8 @@ import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.util.ConcurrentMultivaluedHashMap; import org.keycloak.testsuite.arquillian.TestContext; -import com.google.common.collect.Streams; -import java.util.concurrent.ConcurrentLinkedDeque; +import com.google.common.collect.Streams; /** * Enlist resources to be cleaned after test method diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TextFileChecker.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TextFileChecker.java index 19240b55482..40ff32619ae 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TextFileChecker.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TextFileChecker.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.Consumer; import java.util.stream.Stream; + import org.jboss.logging.Logger; import org.jboss.logging.Logger.Level; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Timer.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Timer.java index 50378c8be17..e650121ec55 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Timer.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/Timer.java @@ -16,15 +16,6 @@ */ package org.keycloak.testsuite.util; -import org.apache.commons.io.IOUtils; -import org.jboss.logging.Logger; -import org.jfree.chart.ChartFactory; -import org.jfree.chart.ChartUtilities; -import org.jfree.chart.JFreeChart; -import org.jfree.chart.plot.PlotOrientation; -import org.jfree.data.xy.XYSeries; -import org.jfree.data.xy.XYSeriesCollection; - import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; @@ -37,6 +28,15 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import org.apache.commons.io.IOUtils; +import org.jboss.logging.Logger; +import org.jfree.chart.ChartFactory; +import org.jfree.chart.ChartUtilities; +import org.jfree.chart.JFreeChart; +import org.jfree.chart.plot.PlotOrientation; +import org.jfree.data.xy.XYSeries; +import org.jfree.data.xy.XYSeriesCollection; + import static org.keycloak.testsuite.utils.io.IOUtil.PROJECT_BUILD_DIRECTORY; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenSignatureUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenSignatureUtil.java index 34f82c882bf..9b1a7a24f55 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenSignatureUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenSignatureUtil.java @@ -27,7 +27,6 @@ import java.util.Base64; import jakarta.ws.rs.core.Response; -import org.jboss.logging.Logger; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.common.crypto.CryptoIntegration; @@ -46,6 +45,8 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.TestContext; +import org.jboss.logging.Logger; + public class TokenSignatureUtil { private static Logger log = Logger.getLogger(TokenSignatureUtil.class); diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenUtil.java index ac529215ef4..3a41c3f5356 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/TokenUtil.java @@ -16,12 +16,13 @@ */ package org.keycloak.testsuite.util; -import org.junit.rules.TestRule; -import org.junit.runners.model.Statement; import org.keycloak.common.util.Time; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.junit.rules.TestRule; +import org.junit.runners.model.Statement; + import static org.junit.Assert.fail; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UIUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UIUtils.java index cec9d9f4bde..d7a5679ed5d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UIUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UIUtils.java @@ -1,9 +1,14 @@ package org.keycloak.testsuite.util; +import java.time.Duration; +import java.util.Optional; +import java.util.function.Supplier; + +import org.keycloak.testsuite.page.AbstractPatternFlyAlert; +import org.keycloak.testsuite.pages.AbstractPage; + import org.apache.commons.lang3.StringUtils; import org.junit.Assert; -import org.keycloak.testsuite.page.AbstractPatternFlyAlert; -import org.keycloak.testsuite.pages.AbstractPage; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.Keys; @@ -11,16 +16,12 @@ import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.TimeoutException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; +import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.Select; import org.openqa.selenium.support.ui.WebDriverWait; -import java.time.Duration; -import java.util.Optional; -import java.util.function.Supplier; - -import org.openqa.selenium.chrome.ChromeDriver; import static org.keycloak.testsuite.util.DroneUtils.getCurrentDriver; import static org.keycloak.testsuite.util.WaitUtils.log; import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/URLUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/URLUtils.java index 0cd5bd150d6..0d33ac82a8a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/URLUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/URLUtils.java @@ -1,14 +1,6 @@ package org.keycloak.testsuite.util; -import org.jboss.logging.Logger; -import org.keycloak.common.util.KeycloakUriBuilder; -import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.openqa.selenium.TimeoutException; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.support.ui.ExpectedCondition; -import org.openqa.selenium.support.ui.WebDriverWait; - import java.net.URI; import java.time.Duration; import java.util.Arrays; @@ -17,9 +9,19 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.keycloak.common.util.KeycloakUriBuilder; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.logging.Logger; +import org.openqa.selenium.TimeoutException; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.support.ui.ExpectedCondition; +import org.openqa.selenium.support.ui.WebDriverWait; + import static org.keycloak.testsuite.util.DroneUtils.getCurrentDriver; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; import static org.keycloak.testsuite.util.ServerURLs.removeDefaultPorts; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; + import static org.openqa.selenium.support.ui.ExpectedConditions.not; import static org.openqa.selenium.support.ui.ExpectedConditions.urlMatches; import static org.openqa.selenium.support.ui.ExpectedConditions.urlToBe; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UserInfoClientUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UserInfoClientUtil.java index d27647c496e..61eee52b2bd 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UserInfoClientUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/UserInfoClientUtil.java @@ -17,11 +17,7 @@ package org.keycloak.testsuite.util; -import org.junit.Assert; -import org.keycloak.protocol.oidc.OIDCLoginProtocolService; -import org.keycloak.representations.UserInfo; -import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.utils.MediaType; +import java.net.URI; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.Invocation; @@ -29,7 +25,13 @@ import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import java.net.URI; + +import org.keycloak.protocol.oidc.OIDCLoginProtocolService; +import org.keycloak.representations.UserInfo; +import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.keycloak.utils.MediaType; + +import org.junit.Assert; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/VaultUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/VaultUtils.java index 1d5699d1780..4e41272901c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/VaultUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/VaultUtils.java @@ -17,14 +17,14 @@ package org.keycloak.testsuite.util; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.arquillian.SuiteContext; import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.testsuite.arquillian.containers.AbstractQuarkusDeployableContainer; -import java.util.ArrayList; -import java.util.List; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java index 7f53067ae01..f9deaad02dd 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/WaitUtils.java @@ -16,10 +16,19 @@ */ package org.keycloak.testsuite.util; -import org.jboss.arquillian.graphene.wait.ElementBuilder; +import java.time.Duration; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; + import org.keycloak.executors.ExecutorsProvider; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.pages.AbstractPage; + +import org.jboss.arquillian.graphene.wait.ElementBuilder; import org.openqa.selenium.By; import org.openqa.selenium.TimeoutException; import org.openqa.selenium.WebDriver; @@ -29,18 +38,11 @@ import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.FluentWait; import org.openqa.selenium.support.ui.WebDriverWait; -import java.time.Duration; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.logging.Level; -import java.util.logging.Logger; +import static org.keycloak.testsuite.util.DroneUtils.getCurrentDriver; import static org.jboss.arquillian.graphene.Graphene.waitGui; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import static org.keycloak.testsuite.util.DroneUtils.getCurrentDriver; import static org.openqa.selenium.support.ui.ExpectedConditions.javaScriptThrowsNoExceptions; import static org.openqa.selenium.support.ui.ExpectedConditions.not; import static org.openqa.selenium.support.ui.ExpectedConditions.urlToBe; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseBodyMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseBodyMatcher.java index 9bb0ef3ae7f..e82be9272ac 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseBodyMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseBodyMatcher.java @@ -16,6 +16,8 @@ */ package org.keycloak.testsuite.util.matchers; +import java.io.IOException; + import jakarta.ws.rs.core.Response; import org.apache.http.HttpResponse; @@ -24,8 +26,6 @@ import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; -import java.io.IOException; - /** * Matcher for matching status code of {@link Response} instance. * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseStatusCodeMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseStatusCodeMatcher.java index 78f5e0eb81e..0cb667dd303 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseStatusCodeMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/HttpResponseStatusCodeMatcher.java @@ -17,7 +17,9 @@ package org.keycloak.testsuite.util.matchers; import java.io.IOException; + import jakarta.ws.rs.core.Response; + import org.apache.http.HttpResponse; import org.apache.http.util.EntityUtils; import org.hamcrest.BaseMatcher; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseBodyMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseBodyMatcher.java index cfce5638771..826e0d9d940 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseBodyMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseBodyMatcher.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.util.matchers; import jakarta.ws.rs.core.Response; + import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseHeaderMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseHeaderMatcher.java index 7e1c41371c1..c5ed6854842 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseHeaderMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseHeaderMatcher.java @@ -17,7 +17,9 @@ package org.keycloak.testsuite.util.matchers; import java.util.Map; + import jakarta.ws.rs.core.Response; + import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseStatusCodeMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseStatusCodeMatcher.java index 5170bd2d836..27edfed1255 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseStatusCodeMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/ResponseStatusCodeMatcher.java @@ -17,6 +17,7 @@ package org.keycloak.testsuite.util.matchers; import jakarta.ws.rs.core.Response; + import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlLogoutRequestTypeMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlLogoutRequestTypeMatcher.java index 26417b6cf38..c49b3ce0476 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlLogoutRequestTypeMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlLogoutRequestTypeMatcher.java @@ -5,12 +5,15 @@ */ package org.keycloak.testsuite.util.matchers; +import java.net.URI; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; -import java.net.URI; + import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; + import static org.hamcrest.Matchers.is; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlResponseTypeMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlResponseTypeMatcher.java index ff0fc4d1dc1..740edf481e9 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlResponseTypeMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlResponseTypeMatcher.java @@ -5,13 +5,16 @@ */ package org.keycloak.testsuite.util.matchers; +import java.net.URI; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; -import java.net.URI; + import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; + import static org.hamcrest.Matchers.is; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlStatusResponseTypeMatcher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlStatusResponseTypeMatcher.java index 4153509e8a6..31d2be8c4bd 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlStatusResponseTypeMatcher.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/matchers/SamlStatusResponseTypeMatcher.java @@ -5,15 +5,18 @@ */ package org.keycloak.testsuite.util.matchers; -import org.keycloak.dom.saml.v2.SAML2Object; -import org.keycloak.dom.saml.v2.protocol.StatusCodeType; -import org.keycloak.dom.saml.v2.protocol.StatusResponseType; import java.net.URI; import java.util.ArrayList; import java.util.List; + +import org.keycloak.dom.saml.v2.SAML2Object; +import org.keycloak.dom.saml.v2.protocol.StatusCodeType; +import org.keycloak.dom.saml.v2.protocol.StatusResponseType; + import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; + import static org.hamcrest.Matchers.is; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClient.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClient.java index 33d13e08caf..6eec89dff02 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClient.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/oauth/OAuthClient.java @@ -17,9 +17,10 @@ package org.keycloak.testsuite.util.oauth; -import org.apache.http.impl.client.CloseableHttpClient; import org.keycloak.OAuth2Constants; import org.keycloak.testsuite.pages.LoginPage; + +import org.apache.http.impl.client.CloseableHttpClient; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.PageFactory; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateArtifactMessageStepBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateArtifactMessageStepBuilder.java index ceb577d4b4b..e58d6baf069 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateArtifactMessageStepBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateArtifactMessageStepBuilder.java @@ -1,5 +1,19 @@ package org.keycloak.testsuite.util.saml; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.util.LinkedList; +import java.util.List; + +import org.keycloak.protocol.saml.ArtifactResolver; +import org.keycloak.protocol.saml.DefaultSamlArtifactResolver; +import org.keycloak.saml.common.constants.GeneralConstants; +import org.keycloak.saml.common.exceptions.ProcessingException; +import org.keycloak.testsuite.util.SamlClient; +import org.keycloak.testsuite.util.SamlClientBuilder; + import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; @@ -11,19 +25,6 @@ import org.apache.http.client.utils.URIBuilder; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.message.BasicNameValuePair; import org.jboss.logging.Logger; -import org.keycloak.protocol.saml.ArtifactResolver; -import org.keycloak.protocol.saml.DefaultSamlArtifactResolver; -import org.keycloak.saml.common.constants.GeneralConstants; -import org.keycloak.saml.common.exceptions.ProcessingException; -import org.keycloak.testsuite.util.SamlClient; -import org.keycloak.testsuite.util.SamlClientBuilder; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; -import java.util.LinkedList; -import java.util.List; public class CreateArtifactMessageStepBuilder implements SamlClient.Step { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateAuthnRequestStepBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateAuthnRequestStepBuilder.java index 61599705415..2bcd0a845ca 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateAuthnRequestStepBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateAuthnRequestStepBuilder.java @@ -16,20 +16,23 @@ */ package org.keycloak.testsuite.util.saml; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.admin.Users; -import org.keycloak.testsuite.util.SamlClientBuilder; +import java.net.URI; +import java.util.Base64; +import java.util.UUID; +import java.util.function.Supplier; + +import jakarta.ws.rs.core.HttpHeaders; + import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; +import org.keycloak.representations.idm.UserRepresentation; 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.DocumentUtil; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; +import org.keycloak.testsuite.admin.Users; import org.keycloak.testsuite.util.SamlClient.Binding; -import java.net.URI; -import java.util.Base64; -import java.util.UUID; -import java.util.function.Supplier; +import org.keycloak.testsuite.util.SamlClientBuilder; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; @@ -37,8 +40,6 @@ import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.impl.client.CloseableHttpClient; import org.w3c.dom.Document; -import jakarta.ws.rs.core.HttpHeaders; - public class CreateAuthnRequestStepBuilder extends SamlDocumentStepBuilder { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateLogoutRequestStepBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateLogoutRequestStepBuilder.java index 09245ff2c27..d8abf84433d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateLogoutRequestStepBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/CreateLogoutRequestStepBuilder.java @@ -16,15 +16,17 @@ */ package org.keycloak.testsuite.util.saml; +import java.net.URI; +import java.util.function.Supplier; + import org.keycloak.dom.saml.v2.assertion.BaseIDAbstractType; -import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; import org.keycloak.saml.SAML2LogoutRequestBuilder; import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.testsuite.util.SamlClient.Binding; -import java.net.URI; -import java.util.function.Supplier; +import org.keycloak.testsuite.util.SamlClientBuilder; + import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.protocol.HttpClientContext; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/HandleArtifactStepBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/HandleArtifactStepBuilder.java index 90e386cfec6..38c6a4b785b 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/HandleArtifactStepBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/HandleArtifactStepBuilder.java @@ -1,13 +1,20 @@ package org.keycloak.testsuite.util.saml; -import org.apache.http.NameValuePair; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.client.utils.URLEncodedUtils; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.util.EntityUtils; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.xml.stream.XMLStreamWriter; + +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.common.util.KeyUtils; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.ArtifactResolveType; @@ -23,21 +30,16 @@ import org.keycloak.saml.processing.core.saml.v2.common.IDGenerator; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; import org.keycloak.saml.processing.core.saml.v2.writers.SAMLRequestWriter; import org.keycloak.testsuite.util.SamlClientBuilder; -import org.w3c.dom.Document; -import jakarta.ws.rs.core.UriBuilder; -import javax.xml.stream.XMLStreamWriter; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import org.apache.http.NameValuePair; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.util.EntityUtils; +import org.w3c.dom.Document; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/IdPInitiatedLoginBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/IdPInitiatedLoginBuilder.java index 8d20a89ca2b..cbd1585954c 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/IdPInitiatedLoginBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/IdPInitiatedLoginBuilder.java @@ -16,11 +16,12 @@ */ package org.keycloak.testsuite.util.saml; +import java.net.URI; +import java.util.function.Supplier; + import org.keycloak.saml.common.constants.GeneralConstants; import org.keycloak.testsuite.util.SamlClient.Step; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.net.URI; -import java.util.function.Supplier; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/LoginBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/LoginBuilder.java index 88028dca902..5930731a521 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/LoginBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/LoginBuilder.java @@ -16,17 +16,20 @@ */ package org.keycloak.testsuite.util.saml; -import org.keycloak.testsuite.util.SamlClientBuilder; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.admin.Users; -import org.keycloak.testsuite.util.SamlClient.Step; import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.LinkedList; import java.util.List; import java.util.Objects; + import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; + +import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.admin.Users; +import org.keycloak.testsuite.util.SamlClient.Step; +import org.keycloak.testsuite.util.SamlClientBuilder; + import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; @@ -40,11 +43,13 @@ import org.apache.http.util.EntityUtils; import org.hamcrest.Matchers; import org.jsoup.Jsoup; import org.jsoup.nodes.Element; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; + import static org.keycloak.testsuite.admin.Users.getPasswordOf; import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/ModifySamlResponseStepBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/ModifySamlResponseStepBuilder.java index af4237af89d..3b69d7425ff 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/ModifySamlResponseStepBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/ModifySamlResponseStepBuilder.java @@ -16,14 +16,6 @@ */ package org.keycloak.testsuite.util.saml; -import org.keycloak.saml.common.util.DocumentUtil; -import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; -import org.keycloak.testsuite.util.SamlClientBuilder; -import org.keycloak.dom.saml.v2.SAML2Object; -import org.keycloak.saml.common.constants.GeneralConstants; -import org.keycloak.saml.processing.web.util.PostBindingUtil; -import org.keycloak.saml.processing.web.util.RedirectBindingUtil; -import org.keycloak.testsuite.util.SamlClient.Binding; import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -34,7 +26,18 @@ import java.util.LinkedList; import java.util.List; import java.util.Objects; import java.util.function.Supplier; + import jakarta.ws.rs.core.Response.Status; + +import org.keycloak.dom.saml.v2.SAML2Object; +import org.keycloak.saml.common.constants.GeneralConstants; +import org.keycloak.saml.common.util.DocumentUtil; +import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; +import org.keycloak.saml.processing.web.util.PostBindingUtil; +import org.keycloak.saml.processing.web.util.RedirectBindingUtil; +import org.keycloak.testsuite.util.SamlClient.Binding; +import org.keycloak.testsuite.util.SamlClientBuilder; + import org.apache.commons.io.IOUtils; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; @@ -52,12 +55,14 @@ import org.hamcrest.Matchers; import org.jsoup.Jsoup; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; + +import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; public class ModifySamlResponseStepBuilder extends SamlDocumentStepBuilder { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/RequiredConsentBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/RequiredConsentBuilder.java index 51d22197574..d08b52cb738 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/RequiredConsentBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/RequiredConsentBuilder.java @@ -16,9 +16,6 @@ */ package org.keycloak.testsuite.util.saml; -import org.keycloak.testsuite.util.SamlClient.Step; -import org.keycloak.testsuite.util.SamlClientBuilder; - import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.LinkedList; @@ -26,6 +23,10 @@ import java.util.List; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; + +import org.keycloak.testsuite.util.SamlClient.Step; +import org.keycloak.testsuite.util.SamlClientBuilder; + import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; @@ -39,10 +40,11 @@ import org.apache.http.util.EntityUtils; import org.jsoup.Jsoup; import org.jsoup.nodes.Element; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + /** * @author hmlnarik */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelArtifactResolveReceiver.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelArtifactResolveReceiver.java index 20517c44061..d5bb792da88 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelArtifactResolveReceiver.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelArtifactResolveReceiver.java @@ -1,11 +1,15 @@ package org.keycloak.testsuite.util.saml; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; +import java.io.IOException; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.security.PrivateKey; +import java.security.PublicKey; + import jakarta.ws.rs.core.HttpHeaders; -import org.jboss.logging.Logger; + import org.keycloak.common.util.KeyUtils; import org.keycloak.dom.saml.v2.protocol.ArtifactResolveType; import org.keycloak.dom.saml.v2.protocol.ArtifactResponseType; @@ -20,14 +24,12 @@ import org.keycloak.saml.SignatureAlgorithm; import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.processing.api.saml.v2.response.SAML2Response; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; -import org.w3c.dom.Document; -import java.io.IOException; -import java.io.OutputStream; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.security.PrivateKey; -import java.security.PublicKey; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; +import org.jboss.logging.Logger; +import org.w3c.dom.Document; public class SamlBackchannelArtifactResolveReceiver implements AutoCloseable { @@ -141,5 +143,3 @@ public class SamlBackchannelArtifactResolveReceiver implements AutoCloseable { return "true".equals(client.getAttributes().get(SamlConfigAttributes.SAML_CLIENT_SIGNATURE_ATTRIBUTE)); } } - - diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelLogoutReceiver.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelLogoutReceiver.java index d0cd87f904b..3c82458500d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelLogoutReceiver.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlBackchannelLogoutReceiver.java @@ -1,9 +1,15 @@ package org.keycloak.testsuite.util.saml; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; +import java.io.IOException; +import java.io.OutputStream; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.security.PrivateKey; +import java.security.PublicKey; + +import jakarta.ws.rs.core.HttpHeaders; + import org.keycloak.common.util.KeyUtils; import org.keycloak.dom.saml.v2.protocol.LogoutRequestType; import org.keycloak.dom.saml.v2.protocol.StatusResponseType; @@ -15,15 +21,11 @@ import org.keycloak.saml.SAML2LogoutResponseBuilder; import org.keycloak.saml.SignatureAlgorithm; import org.keycloak.saml.processing.api.saml.v2.response.SAML2Response; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; -import org.w3c.dom.Document; -import jakarta.ws.rs.core.HttpHeaders; -import java.io.IOException; -import java.io.OutputStream; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.security.PrivateKey; -import java.security.PublicKey; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; +import org.w3c.dom.Document; public class SamlBackchannelLogoutReceiver implements AutoCloseable { @@ -120,5 +122,3 @@ public class SamlBackchannelLogoutReceiver implements AutoCloseable { return "true".equals(client.getAttributes().get(SamlConfigAttributes.SAML_CLIENT_SIGNATURE_ATTRIBUTE)); } } - - diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlDocumentStepBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlDocumentStepBuilder.java index 6aa07b2415f..6baa27d9009 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlDocumentStepBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlDocumentStepBuilder.java @@ -16,7 +16,11 @@ */ package org.keycloak.testsuite.util.saml; -import org.keycloak.testsuite.util.SamlClientBuilder; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.util.function.Consumer; +import javax.xml.stream.XMLStreamWriter; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.protocol.ArtifactResolveType; import org.keycloak.dom.saml.v2.protocol.ArtifactResponseType; @@ -34,10 +38,8 @@ import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLProtocolQName import org.keycloak.saml.processing.core.saml.v2.writers.SAMLRequestWriter; import org.keycloak.saml.processing.core.saml.v2.writers.SAMLResponseWriter; import org.keycloak.testsuite.util.SamlClient.Step; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.util.function.Consumer; -import javax.xml.stream.XMLStreamWriter; +import org.keycloak.testsuite.util.SamlClientBuilder; + import org.jboss.logging.Logger; import org.junit.Assert; import org.w3c.dom.Document; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlMessageReceiver.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlMessageReceiver.java index cc73202e0f0..b3558e555e8 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlMessageReceiver.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SamlMessageReceiver.java @@ -1,14 +1,6 @@ package org.keycloak.testsuite.util.saml; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; -import org.apache.commons.io.IOUtils; -import org.keycloak.saml.SAMLRequestParser; -import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; -import org.keycloak.saml.processing.web.util.RedirectBindingUtil; - import java.io.IOException; import java.io.OutputStream; import java.net.InetAddress; @@ -17,6 +9,15 @@ import java.nio.charset.StandardCharsets; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.keycloak.saml.SAMLRequestParser; +import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; +import org.keycloak.saml.processing.web.util.RedirectBindingUtil; + +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; +import org.apache.commons.io.IOUtils; + public class SamlMessageReceiver implements AutoCloseable { private final static Pattern SAML_MESSAGE_PATTER = Pattern.compile(".*SAML(?:Response|Request)=([^&]*).*"); @@ -80,5 +81,3 @@ public class SamlMessageReceiver implements AutoCloseable { } } } - - diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SessionStateChecker.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SessionStateChecker.java index c6db2a9477c..edad2965af6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SessionStateChecker.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/SessionStateChecker.java @@ -1,7 +1,9 @@ package org.keycloak.testsuite.util.saml; -import org.infinispan.util.function.SerializableConsumer; -import org.infinispan.util.function.SerializableFunction; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -10,15 +12,14 @@ import org.keycloak.sessions.CommonClientSessionModel; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.runonserver.FetchOnServer; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; +import org.infinispan.util.function.SerializableConsumer; +import org.infinispan.util.function.SerializableFunction; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; public class SessionStateChecker implements Runnable { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/UpdateProfileBuilder.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/UpdateProfileBuilder.java index bb1b95910b2..5d3195f852e 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/UpdateProfileBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/saml/UpdateProfileBuilder.java @@ -16,8 +16,6 @@ */ package org.keycloak.testsuite.util.saml; -import org.keycloak.testsuite.util.SamlClientBuilder; -import org.keycloak.testsuite.util.SamlClient.Step; import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -26,8 +24,13 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; + import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; + +import org.keycloak.testsuite.util.SamlClient.Step; +import org.keycloak.testsuite.util.SamlClientBuilder; + import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; @@ -41,10 +44,12 @@ import org.apache.http.util.EntityUtils; import org.jboss.logging.Logger; import org.jsoup.Jsoup; import org.jsoup.nodes.Element; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; + import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/authenticators/DefaultVirtualAuthOptions.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/authenticators/DefaultVirtualAuthOptions.java index 7fd5b7b722b..1f46d5555c4 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/authenticators/DefaultVirtualAuthOptions.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/authenticators/DefaultVirtualAuthOptions.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.webauthn.authenticators; -import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; - import java.util.function.Supplier; +import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; + import static org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions.Protocol.U2F; import static org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions.Transport.BLE; import static org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions.Transport.INTERNAL; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/authenticators/KcVirtualAuthenticator.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/authenticators/KcVirtualAuthenticator.java index 2c1c396f7e5..7932441ec68 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/authenticators/KcVirtualAuthenticator.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/authenticators/KcVirtualAuthenticator.java @@ -17,12 +17,12 @@ package org.keycloak.testsuite.webauthn.authenticators; -import org.openqa.selenium.virtualauthenticator.VirtualAuthenticator; -import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; - import java.util.Arrays; import java.util.Map; +import org.openqa.selenium.virtualauthenticator.VirtualAuthenticator; +import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; + /** * Keycloak Virtual Authenticator *

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/AbstractAccountPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/AbstractAccountPage.java index 152eb27e04d..6d9a7fd971a 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/AbstractAccountPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/AbstractAccountPage.java @@ -17,10 +17,11 @@ package org.keycloak.testsuite.webauthn.pages; -import org.keycloak.testsuite.auth.page.AuthRealm; +import java.util.List; import jakarta.ws.rs.core.UriBuilder; -import java.util.List; + +import org.keycloak.testsuite.auth.page.AuthRealm; /** * @author Vaclav Muzikar diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/AbstractLoggedInPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/AbstractLoggedInPage.java index b54c8f046fa..544667f2fa6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/AbstractLoggedInPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/AbstractLoggedInPage.java @@ -17,16 +17,17 @@ package org.keycloak.testsuite.webauthn.pages; -import org.jboss.arquillian.graphene.page.Page; +import java.util.LinkedList; + import org.keycloak.testsuite.webauthn.pages.fragments.ContentAlert; import org.keycloak.testsuite.webauthn.pages.fragments.ContinueCancelModal; import org.keycloak.testsuite.webauthn.pages.fragments.LoggedInPageHeader; import org.keycloak.testsuite.webauthn.pages.fragments.Sidebar; + +import org.jboss.arquillian.graphene.page.Page; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import java.util.LinkedList; - import static org.keycloak.testsuite.util.UIUtils.clickLink; import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/SigningInPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/SigningInPage.java index 5d5b29e40e6..d552cb36169 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/SigningInPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/SigningInPage.java @@ -17,14 +17,14 @@ package org.keycloak.testsuite.webauthn.pages; -import org.openqa.selenium.By; -import org.openqa.selenium.NoSuchElementException; -import org.openqa.selenium.WebElement; - import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Locale; +import org.openqa.selenium.By; +import org.openqa.selenium.NoSuchElementException; +import org.openqa.selenium.WebElement; + import static org.keycloak.testsuite.util.UIUtils.clickLink; import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnAuthenticatorsList.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnAuthenticatorsList.java index ec4a1ef1838..7e0c78e5b22 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnAuthenticatorsList.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnAuthenticatorsList.java @@ -17,10 +17,6 @@ package org.keycloak.testsuite.webauthn.pages; -import org.openqa.selenium.By; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; - import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -28,6 +24,10 @@ import java.util.NoSuchElementException; import java.util.Objects; import java.util.stream.Collectors; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; + import static org.keycloak.testsuite.util.UIUtils.getTextFromElementOrNull; /** diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnErrorPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnErrorPage.java index 02ef01f5603..72d6c30f5ac 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnErrorPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnErrorPage.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.webauthn.pages; -import org.junit.Assert; import org.keycloak.testsuite.pages.LanguageComboboxAwarePage; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.WaitUtils; + +import org.junit.Assert; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnLoginPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnLoginPage.java index 4b08dae6bd1..9c0662a6773 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnLoginPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnLoginPage.java @@ -17,17 +17,18 @@ package org.keycloak.testsuite.webauthn.pages; -import org.jboss.arquillian.graphene.page.Page; +import java.util.List; +import java.util.NoSuchElementException; + import org.keycloak.testsuite.pages.LanguageComboboxAwarePage; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.WaitUtils; + +import org.jboss.arquillian.graphene.page.Page; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import java.util.List; -import java.util.NoSuchElementException; - /** * Page shown during WebAuthn login. Page is useful with Chrome testing API */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnPolicyPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnPolicyPage.java index f58644ed6e3..57268674dc8 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnPolicyPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnPolicyPage.java @@ -17,18 +17,19 @@ package org.keycloak.testsuite.webauthn.pages; +import java.util.function.Supplier; + +import org.keycloak.testsuite.console.page.fragment.OnOffSwitch; +import org.keycloak.testsuite.webauthn.utils.PropertyRequirement; + import com.webauthn4j.data.AttestationConveyancePreference; import com.webauthn4j.data.AuthenticatorAttachment; import com.webauthn4j.data.UserVerificationRequirement; -import org.keycloak.testsuite.console.page.fragment.OnOffSwitch; -import org.keycloak.testsuite.webauthn.utils.PropertyRequirement; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.Select; -import java.util.function.Supplier; - import static org.keycloak.testsuite.util.UIUtils.getTextInputValue; import static org.keycloak.testsuite.util.UIUtils.setTextInputValue; import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnRegisterPage.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnRegisterPage.java index df1824ec3d3..c80e65a2ea6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnRegisterPage.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/WebAuthnRegisterPage.java @@ -17,10 +17,13 @@ package org.keycloak.testsuite.webauthn.pages; -import org.hamcrest.CoreMatchers; +import java.time.Duration; + import org.keycloak.testsuite.pages.LogoutSessionsPage; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.WaitUtils; + +import org.hamcrest.CoreMatchers; import org.openqa.selenium.Alert; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; @@ -30,10 +33,9 @@ import org.openqa.selenium.support.FindBy; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import java.time.Duration; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; /** * WebAuthnRegisterPage, which is displayed when WebAuthnRegister required action is triggered. It is useful with Chrome testing API. diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/AbstractHeader.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/AbstractHeader.java index fea77bb28ef..1c491dfe0af 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/AbstractHeader.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/AbstractHeader.java @@ -19,11 +19,12 @@ package org.keycloak.testsuite.webauthn.pages.fragments; import org.openqa.selenium.WebElement; -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.util.UIUtils.click; import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; import static org.keycloak.testsuite.util.UIUtils.isElementVisible; +import static org.junit.Assert.assertEquals; + /** * @author Vaclav Muzikar */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContentAlert.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContentAlert.java index aa6b29f136f..78be96e5579 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContentAlert.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContentAlert.java @@ -23,12 +23,13 @@ import org.openqa.selenium.TimeoutException; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.util.UIUtils.doesElementClassContain; import static org.keycloak.testsuite.util.UIUtils.getTextFromElement; import static org.keycloak.testsuite.util.WaitUtils.waitUntilElementIsNotPresent; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * @author Vaclav Muzikar * diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContinueCancelModal.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContinueCancelModal.java index 01113ab2bd4..a16e44f30b6 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContinueCancelModal.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/ContinueCancelModal.java @@ -22,11 +22,12 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.util.UIUtils.clickLink; import static org.keycloak.testsuite.util.UIUtils.isElementVisible; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * @author Vaclav Muzikar */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/Sidebar.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/Sidebar.java index 95b19cccd7d..150bfe943b2 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/Sidebar.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/pages/fragments/Sidebar.java @@ -17,20 +17,21 @@ package org.keycloak.testsuite.webauthn.pages.fragments; +import java.util.List; + +import org.jboss.arquillian.drone.api.annotation.Drone; import org.jboss.arquillian.graphene.fragment.Root; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; +import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; -import java.util.List; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.openqa.selenium.WebDriver; +import static org.keycloak.testsuite.util.UIUtils.clickLink; +import static org.keycloak.testsuite.util.WaitUtils.pause; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.util.UIUtils.clickLink; -import static org.keycloak.testsuite.util.WaitUtils.pause; /** * @author Vaclav Muzikar diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/AbstractWebAuthnRealmUpdater.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/AbstractWebAuthnRealmUpdater.java index b9025a00dde..1e616a347e3 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/AbstractWebAuthnRealmUpdater.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/AbstractWebAuthnRealmUpdater.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.webauthn.updaters; +import java.util.List; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; -import java.util.List; - /** * @author Martin Bartos */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/PasswordLessRealmAttributeUpdater.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/PasswordLessRealmAttributeUpdater.java index b2b0cbe86ac..93f65793d7f 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/PasswordLessRealmAttributeUpdater.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/PasswordLessRealmAttributeUpdater.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.webauthn.updaters; -import org.keycloak.admin.client.resource.RealmResource; - import java.util.List; +import org.keycloak.admin.client.resource.RealmResource; + /** * @author Martin Bartos */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/WebAuthnRealmAttributeUpdater.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/WebAuthnRealmAttributeUpdater.java index 7ec7eaca0bf..e3bf073f455 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/WebAuthnRealmAttributeUpdater.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/updaters/WebAuthnRealmAttributeUpdater.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.webauthn.updaters; -import org.keycloak.admin.client.resource.RealmResource; - import java.util.List; +import org.keycloak.admin.client.resource.RealmResource; + /** * @author Martin Bartos */ diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/PropertyRequirement.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/PropertyRequirement.java index d70d5171330..a673bbe270e 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/PropertyRequirement.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/PropertyRequirement.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.webauthn.utils; import java.util.Arrays; + import org.keycloak.models.Constants; public enum PropertyRequirement { diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/SigningInPageUtils.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/SigningInPageUtils.java index 3707df5076f..e961091a73d 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/SigningInPageUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/SigningInPageUtils.java @@ -17,20 +17,22 @@ package org.keycloak.testsuite.webauthn.utils; +import java.time.LocalDateTime; +import java.util.List; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; +import org.keycloak.testsuite.pages.DeleteCredentialPage; import org.keycloak.testsuite.webauthn.pages.AbstractLoggedInPage; import org.keycloak.testsuite.webauthn.pages.SigningInPage; -import org.keycloak.testsuite.pages.DeleteCredentialPage; -import java.time.LocalDateTime; -import java.util.List; + +import static org.keycloak.testsuite.util.UIUtils.refreshPageAndWaitForLoad; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.UIUtils.refreshPageAndWaitForLoad; /** * Helper class for SigningIn page diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnBrowserDriverUtil.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnBrowserDriverUtil.java index 3db51a29e99..9d55c400aba 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnBrowserDriverUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnBrowserDriverUtil.java @@ -18,6 +18,7 @@ package org.keycloak.testsuite.webauthn.utils; import org.keycloak.testsuite.util.BrowserDriverUtil; + import org.openqa.selenium.WebDriver; import org.openqa.selenium.chromium.ChromiumDriver; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnDataWrapper.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnDataWrapper.java index 9c9b3b6704a..57b7d0802d7 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnDataWrapper.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnDataWrapper.java @@ -17,17 +17,18 @@ package org.keycloak.testsuite.webauthn.utils; -import com.webauthn4j.converter.util.CborConverter; -import com.webauthn4j.converter.util.ObjectConverter; -import com.webauthn4j.data.attestation.authenticator.COSEKey; +import java.io.Serializable; + import org.keycloak.common.util.Base64Url; import org.keycloak.credential.CredentialModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.UserModel; import org.keycloak.models.SubjectCredentialManager; +import org.keycloak.models.UserModel; import org.keycloak.models.credential.dto.WebAuthnCredentialData; -import java.io.Serializable; +import com.webauthn4j.converter.util.CborConverter; +import com.webauthn4j.converter.util.ObjectConverter; +import com.webauthn4j.data.attestation.authenticator.COSEKey; import static org.keycloak.models.credential.WebAuthnCredentialModel.createFromCredentialModel; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnRealmData.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnRealmData.java index 977d0c6c726..1b5e622a634 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnRealmData.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/webauthn/utils/WebAuthnRealmData.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.webauthn.utils; -import org.keycloak.representations.idm.RealmRepresentation; - import java.util.List; import java.util.function.Consumer; +import org.keycloak.representations.idm.RealmRepresentation; + import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAdminTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAdminTest.java index 819482d1aea..5216568e6f7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAdminTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAdminTest.java @@ -17,23 +17,24 @@ package org.keycloak.testsuite; -import org.junit.Before; -import org.junit.Rule; -import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.events.log.JBossLoggingEventListenerProviderFactory; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.events.TestEventsListenerProviderFactory; -import org.keycloak.testsuite.util.TestCleanup; -import org.keycloak.testsuite.util.AssertAdminEvents; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + +import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.events.log.JBossLoggingEventListenerProviderFactory; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.events.TestEventsListenerProviderFactory; +import org.keycloak.testsuite.util.AssertAdminEvents; +import org.keycloak.testsuite.util.TestCleanup; +import org.keycloak.util.JsonSerialization; + import com.fasterxml.jackson.core.type.TypeReference; +import org.junit.Before; +import org.junit.Rule; /** * This class adapts the functionality from the old testsuite to make tests diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java index 94ba1697fb9..ab2bfda107f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthTest.java @@ -16,8 +16,9 @@ */ package org.keycloak.testsuite; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; +import java.text.MessageFormat; +import java.util.List; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.representations.idm.RealmRepresentation; @@ -27,10 +28,10 @@ import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.auth.page.login.OIDCLogin; import org.keycloak.testsuite.auth.page.login.SAMLPostLogin; import org.keycloak.testsuite.auth.page.login.SAMLRedirectLogin; -import org.openqa.selenium.Cookie; -import java.text.MessageFormat; -import java.util.List; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.openqa.selenium.Cookie; import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD; import static org.keycloak.testsuite.admin.ApiUtil.assignClientRoles; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthenticationTest.java index 449650d783e..97567d7c80a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractAuthenticationTest.java @@ -17,8 +17,8 @@ package org.keycloak.testsuite; -import org.junit.Before; -import org.junit.Rule; +import java.util.List; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.AuthenticationFlowRepresentation; @@ -26,7 +26,8 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.util.AssertAdminEvents; import org.keycloak.testsuite.util.RealmBuilder; -import java.util.List; +import org.junit.Before; +import org.junit.Rule; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractChangeImportedUserPasswordsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractChangeImportedUserPasswordsTest.java index a87549e94fd..b7db79ed4c9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractChangeImportedUserPasswordsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractChangeImportedUserPasswordsTest.java @@ -18,7 +18,7 @@ package org.keycloak.testsuite; import java.util.List; import java.util.Map; -import org.junit.Before; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.models.credential.PasswordCredentialModel; import org.keycloak.representations.idm.CredentialRepresentation; @@ -26,6 +26,8 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.admin.ApiUtil; +import org.junit.Before; + /** *

Abstract class that re-generates all imported user passwords with a random one. * This way all the passwords are random and cannot be rejected by security diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractClientTest.java index fc65e80a037..5cba799b915 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractClientTest.java @@ -17,9 +17,10 @@ package org.keycloak.testsuite; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; +import java.util.List; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; @@ -32,8 +33,9 @@ import org.keycloak.testsuite.util.AdminEventPaths; import org.keycloak.testsuite.util.AssertAdminEvents; import org.keycloak.testsuite.util.RealmBuilder; -import jakarta.ws.rs.core.Response; -import java.util.List; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractConcurrencyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractConcurrencyTest.java index 5f0250bdd95..1d6b2c7aba6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractConcurrencyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractConcurrencyTest.java @@ -17,15 +17,10 @@ package org.keycloak.testsuite; -import org.keycloak.admin.client.Keycloak; -import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.utils.tls.TLSUtils; - +import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.LinkedList; -import java.util.Collection; import java.util.List; import java.util.Set; import java.util.concurrent.Callable; @@ -35,6 +30,11 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.keycloak.admin.client.Keycloak; +import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.utils.tls.TLSUtils; + /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java index 667e19078a8..17512d017f0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractKeycloakTest.java @@ -16,21 +16,33 @@ */ package org.keycloak.testsuite; +import java.io.IOException; +import java.io.InputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.io.PrintWriter; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Scanner; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.function.Consumer; +import java.util.function.Supplier; + +import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.PropertiesConfiguration; -import org.jboss.arquillian.container.test.api.RunAsClient; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.logging.Logger; -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.runner.RunWith; -import org.junit.runners.MethodSorters; -import org.junit.runners.model.TestTimedOutException; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.RealmsResource; @@ -61,43 +73,29 @@ import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.util.BrowserTabUtil; import org.keycloak.testsuite.util.CryptoInitRule; import org.keycloak.testsuite.util.DroneUtils; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.TestCleanup; import org.keycloak.testsuite.util.TestEventsLogger; import org.keycloak.testsuite.util.WaitUtils; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.apache.commons.configuration.ConfigurationException; +import org.apache.commons.configuration.PropertiesConfiguration; +import org.jboss.arquillian.container.test.api.RunAsClient; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.logging.Logger; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; +import org.junit.runners.model.TestTimedOutException; import org.openqa.selenium.WebDriver; -import jakarta.ws.rs.NotFoundException; - -import java.io.IOException; -import java.io.InputStream; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; -import java.io.PrintWriter; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Scanner; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.function.Consumer; -import java.util.function.Supplier; - import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; + import static org.keycloak.testsuite.admin.Users.setPasswordFor; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_HOST; @@ -107,6 +105,11 @@ import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; import static org.keycloak.testsuite.util.ServerURLs.removeDefaultPorts; import static org.keycloak.testsuite.util.URLUtils.navigateToUri; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractTestRealmKeycloakTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractTestRealmKeycloakTest.java index eea1ddc54df..33e510cc037 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractTestRealmKeycloakTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AbstractTestRealmKeycloakTest.java @@ -17,7 +17,9 @@ package org.keycloak.testsuite; -import org.junit.Before; +import java.lang.reflect.Field; +import java.util.List; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.util.reflections.Reflections; import org.keycloak.events.Details; @@ -29,8 +31,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.lang.reflect.Field; -import java.util.List; +import org.junit.Before; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/Assert.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/Assert.java index 52badde8df9..6c6799754bc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/Assert.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/Assert.java @@ -17,7 +17,12 @@ package org.keycloak.testsuite; -import org.hamcrest.MatcherAssert; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation; @@ -32,11 +37,7 @@ import org.keycloak.representations.idm.UserProfileAttributeMetadata; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.info.ThemeInfoRepresentation; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.hamcrest.MatcherAssert; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsInAnyOrder; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AssertEvents.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AssertEvents.java index 626714a4923..e15c8587b1d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AssertEvents.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/AssertEvents.java @@ -17,14 +17,14 @@ package org.keycloak.testsuite; -import org.hamcrest.CoreMatchers; -import org.hamcrest.Description; -import org.hamcrest.Matcher; -import org.hamcrest.Matchers; -import org.hamcrest.TypeSafeMatcher; -import org.junit.Assert; -import org.junit.rules.TestRule; -import org.junit.runners.model.Statement; +import java.util.Arrays; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.regex.Pattern; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; import org.keycloak.common.util.Time; @@ -42,18 +42,20 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation; import org.keycloak.util.TokenUtil; -import java.util.Arrays; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.regex.Pattern; +import org.hamcrest.CoreMatchers; +import org.hamcrest.Description; +import org.hamcrest.Matcher; +import org.hamcrest.Matchers; +import org.hamcrest.TypeSafeMatcher; +import org.junit.Assert; +import org.junit.rules.TestRule; +import org.junit.runners.model.Statement; +import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.emptyOrNullString; import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractRestServiceTest.java index 9e621ce158c..4ad97640139 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AbstractRestServiceTest.java @@ -16,21 +16,9 @@ */ package org.keycloak.testsuite.account; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.keycloak.common.Profile.Feature.ACCOUNT_API; -import static org.keycloak.testsuite.util.oauth.OAuthClient.APP_ROOT; - import java.io.IOException; import java.util.List; -import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.account.SessionRepresentation; import org.keycloak.representations.idm.RealmRepresentation; @@ -42,6 +30,20 @@ import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.TokenUtil; import org.keycloak.testsuite.util.UserBuilder; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.common.Profile.Feature.ACCOUNT_API; +import static org.keycloak.testsuite.util.oauth.OAuthClient.APP_ROOT; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceCorsTest.java index 9ac9084d99a..ad176a23baf 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceCorsTest.java @@ -16,25 +16,26 @@ */ package org.keycloak.testsuite.account; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; + import org.keycloak.common.enums.AccountRestApiVersion; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.util.TokenUtil; import org.keycloak.testsuite.util.WebDriverLogDumper; + +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.JavascriptExecutor; -import java.io.IOException; - import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java index a196e577a7a..f0431315fcd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceReadOnlyAttributesTest.java @@ -26,10 +26,6 @@ import java.util.Set; import jakarta.ws.rs.BadRequestException; -import org.jboss.logging.Logger; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.http.simple.SimpleHttpResponse; @@ -44,10 +40,15 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.userprofile.UserProfileConstants; +import org.jboss.logging.Logger; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java index 1e5725c9799..0c92cce7b3c 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceTest.java @@ -16,18 +16,21 @@ */ package org.keycloak.testsuite.account; -import com.fasterxml.jackson.core.type.TypeReference; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; + import jakarta.ws.rs.ClientErrorException; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.http.Header; -import org.apache.http.impl.client.CloseableHttpClient; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; @@ -83,15 +86,16 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.userprofile.UserProfileContext; -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.stream.Collectors; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.http.Header; +import org.apache.http.impl.client.CloseableHttpClient; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ALL; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -103,7 +107,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ALL; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java index 430ea758745..bc1c09d24ee 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/AccountRestServiceWithUserProfileTest.java @@ -16,21 +16,6 @@ */ package org.keycloak.testsuite.account; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.keycloak.testsuite.account.AccountRestServiceTest.assertUserProfileAttributeMetadata; -import static org.keycloak.testsuite.account.AccountRestServiceTest.getUserProfileAttributeMetadata; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ALL; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_EDITABLE; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_ONLY; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; - import java.io.IOException; import java.util.Collections; import java.util.HashMap; @@ -39,8 +24,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.events.Details; import org.keycloak.events.EventType; @@ -48,10 +31,10 @@ import org.keycloak.http.simple.SimpleHttpRequest; import org.keycloak.http.simple.SimpleHttpResponse; import org.keycloak.models.UserModel; import org.keycloak.models.UserModel.RequiredAction; -import org.keycloak.representations.idm.UserProfileAttributeMetadata; -import org.keycloak.representations.idm.UserProfileMetadata; import org.keycloak.representations.account.UserRepresentation; import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.representations.idm.UserProfileAttributeMetadata; +import org.keycloak.representations.idm.UserProfileMetadata; import org.keycloak.representations.userprofile.config.UPAttribute; import org.keycloak.representations.userprofile.config.UPAttributePermissions; import org.keycloak.representations.userprofile.config.UPConfig; @@ -60,6 +43,25 @@ import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.userprofile.UserProfileContext; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.account.AccountRestServiceTest.assertUserProfileAttributeMetadata; +import static org.keycloak.testsuite.account.AccountRestServiceTest.getUserProfileAttributeMetadata; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_EDITABLE; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_ONLY; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ALL; +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * Test account rest service with custom user profile configurations * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/LinkedAccountsRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/LinkedAccountsRestServiceTest.java index 567432571c5..e36181c177f 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/LinkedAccountsRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/LinkedAccountsRestServiceTest.java @@ -16,36 +16,42 @@ */ package org.keycloak.testsuite.account; -import com.fasterxml.jackson.core.type.TypeReference; -import java.util.Objects; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.keycloak.admin.client.resource.IdentityProviderResource; -import org.keycloak.representations.idm.IdentityProviderRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.broker.util.SimpleHttpDefault; -import org.keycloak.testsuite.util.TokenUtil; -import org.keycloak.testsuite.util.UserBuilder; - import java.io.IOException; import java.net.URI; import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; +import java.util.Objects; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.keycloak.admin.client.resource.IdentityProviderResource; +import org.keycloak.representations.account.AccountLinkUriRepresentation; +import org.keycloak.representations.account.LinkedAccountRepresentation; +import org.keycloak.representations.idm.FederatedIdentityRepresentation; +import org.keycloak.representations.idm.IdentityProviderRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; +import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.broker.util.SimpleHttpDefault; +import org.keycloak.testsuite.util.IdentityProviderBuilder; +import org.keycloak.testsuite.util.TokenUtil; +import org.keycloak.testsuite.util.UserBuilder; + +import com.fasterxml.jackson.core.type.TypeReference; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; -import org.keycloak.representations.idm.FederatedIdentityRepresentation; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.util.IdentityProviderBuilder; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.junit.After; +import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +import static org.keycloak.models.Constants.ACCOUNT_CONSOLE_CLIENT_ID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; @@ -54,12 +60,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.models.Constants.ACCOUNT_CONSOLE_CLIENT_ID; - -import org.junit.FixMethodOrder; -import org.junit.runners.MethodSorters; -import org.keycloak.representations.account.AccountLinkUriRepresentation; -import org.keycloak.representations.account.LinkedAccountRepresentation; /** * @author Stan Silvert diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ResourcesRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ResourcesRestServiceTest.java index 07cb3335ed6..8eece4bdb00 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ResourcesRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/ResourcesRestServiceTest.java @@ -16,9 +16,20 @@ */ package org.keycloak.testsuite.account; -import com.fasterxml.jackson.core.type.TypeReference; -import org.junit.BeforeClass; -import org.junit.Test; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Consumer; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -48,18 +59,11 @@ import org.keycloak.testsuite.util.TokenUtil; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; -import jakarta.ws.rs.core.Response; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Consumer; +import com.fasterxml.jackson.core.type.TypeReference; +import org.junit.BeforeClass; +import org.junit.Test; + +import static org.keycloak.common.util.Encode.encodePathAsIs; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; @@ -68,7 +72,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.common.util.Encode.encodePathAsIs; /** * @author Pedro Igor diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java index 11e6b49ffa3..b429f452a21 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/SessionRestServiceTest.java @@ -16,11 +16,10 @@ */ package org.keycloak.testsuite.account; -import com.fasterxml.jackson.core.type.TypeReference; -import org.hamcrest.Matchers; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.drone.webdriver.htmlunit.DroneHtmlUnitDriver; -import org.junit.Test; +import java.io.IOException; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.representations.account.ClientRepresentation; import org.keycloak.representations.account.DeviceRepresentation; import org.keycloak.representations.account.SessionRepresentation; @@ -33,11 +32,13 @@ import org.keycloak.testsuite.util.ThirdBrowser; import org.keycloak.testsuite.util.TokenUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.openqa.selenium.WebDriver; -import java.io.IOException; -import java.util.List; -import java.util.stream.Collectors; +import com.fasterxml.jackson.core.type.TypeReference; +import org.hamcrest.Matchers; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.drone.webdriver.htmlunit.DroneHtmlUnitDriver; +import org.junit.Test; +import org.openqa.selenium.WebDriver; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/AbstractAccountManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/AbstractAccountManagementTest.java index 5d33ba2d176..4f33c498068 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/AbstractAccountManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/AbstractAccountManagementTest.java @@ -17,9 +17,10 @@ package org.keycloak.testsuite.account.custom; -import org.junit.Before; import org.keycloak.testsuite.AbstractAuthTest; +import org.junit.Before; + import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/AbstractCustomAccountManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/AbstractCustomAccountManagementTest.java index 1bf6e826bac..c4e4c5cf376 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/AbstractCustomAccountManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/AbstractCustomAccountManagementTest.java @@ -17,12 +17,14 @@ package org.keycloak.testsuite.account.custom; -import org.junit.Before; +import java.util.List; +import java.util.function.Function; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.representations.idm.AuthenticationExecutionInfoRepresentation; -import java.util.List; -import java.util.function.Function; + +import org.junit.Before; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowCookieTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowCookieTest.java index 22fdf2d623a..85639117574 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowCookieTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowCookieTest.java @@ -16,9 +16,10 @@ */ package org.keycloak.testsuite.account.custom; -import org.junit.Test; import org.keycloak.models.AuthenticationExecutionModel.Requirement; +import org.junit.Test; + import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java index fa46f5d60b5..78bb1eb534c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java @@ -16,9 +16,16 @@ */ package org.keycloak.testsuite.account.custom; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Test; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticatorFactory; import org.keycloak.models.AuthenticationExecutionModel.Requirement; @@ -36,24 +43,13 @@ import org.keycloak.testsuite.pages.LoginConfigTotpPage; import org.keycloak.testsuite.pages.LoginTotpPage; import org.keycloak.testsuite.pages.PageUtils; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; - -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Test; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.keycloak.authentication.authenticators.browser.ConditionalOtpFormAuthenticator.DEFAULT_OTP_OUTCOME; import static org.keycloak.authentication.authenticators.browser.ConditionalOtpFormAuthenticator.FORCE; import static org.keycloak.authentication.authenticators.browser.ConditionalOtpFormAuthenticator.FORCE_OTP_FOR_HTTP_HEADER; @@ -67,6 +63,12 @@ import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * * @author Vlastislav Ramik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionTest.java index 8b67a02935e..dc1e2df19e9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionTest.java @@ -16,10 +16,13 @@ */ package org.keycloak.testsuite.actions; -import org.apache.http.NameValuePair; -import org.apache.http.client.utils.URLEncodedUtils; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Rule; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.util.List; + +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.AssertEvents; @@ -28,16 +31,11 @@ import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.WaitUtils; -import jakarta.ws.rs.core.UriBuilder; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; -import java.util.List; +import org.apache.http.NameValuePair; +import org.apache.http.client.utils.URLEncodedUtils; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Rule; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.OAuth2Constants.REDIRECT_URI; import static org.keycloak.OAuth2Constants.RESPONSE_TYPE; import static org.keycloak.OAuth2Constants.SCOPE; @@ -46,6 +44,11 @@ import static org.keycloak.models.Constants.KC_ACTION; import static org.keycloak.models.Constants.KC_ACTION_STATUS; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; + /** * @author Stan Silvert */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionUpdateEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionUpdateEmailTest.java index 910d3f9c561..754fefe2d92 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionUpdateEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractAppInitiatedActionUpdateEmailTest.java @@ -16,10 +16,6 @@ */ package org.keycloak.testsuite.actions; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.UserModel; import org.keycloak.models.UserModel.RequiredAction; @@ -29,6 +25,11 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.EmailUpdatePage; import org.keycloak.testsuite.util.UserBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + public abstract class AbstractAppInitiatedActionUpdateEmailTest extends AbstractAppInitiatedActionTest { @Page diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractRequiredActionUpdateEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractRequiredActionUpdateEmailTest.java index c218a6f4f4d..3a379ed4d6b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractRequiredActionUpdateEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AbstractRequiredActionUpdateEmailTest.java @@ -16,16 +16,8 @@ */ package org.keycloak.testsuite.actions; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; - import java.util.Arrays; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.Profile; @@ -44,8 +36,18 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginUpdateProfilePage; import org.keycloak.testsuite.util.SecondBrowser; import org.keycloak.testsuite.util.UserBuilder; + +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.WebDriver; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + @EnableFeature(Profile.Feature.UPDATE_EMAIL) public abstract class AbstractRequiredActionUpdateEmailTest extends AbstractTestRealmKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/ActionUtil.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/ActionUtil.java index b8b5f46a05f..f49a664da59 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/ActionUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/ActionUtil.java @@ -17,15 +17,15 @@ package org.keycloak.testsuite.actions; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.admin.client.Keycloak; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.util.UserBuilder; -import java.util.LinkedList; -import java.util.List; - /** * * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionDeleteCredentialTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionDeleteCredentialTest.java index 3bfa98cbe4a..9f459c44e8e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionDeleteCredentialTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionDeleteCredentialTest.java @@ -19,16 +19,11 @@ package org.keycloak.testsuite.actions; +import java.util.List; + import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.core.Response; -import java.util.List; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.authentication.requiredactions.DeleteCredentialAction; import org.keycloak.events.Details; import org.keycloak.events.Errors; @@ -50,6 +45,14 @@ import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.MailUtils; import org.keycloak.testsuite.util.UserBuilder; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionResetPasswordTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionResetPasswordTest.java index 9132fa5e901..e3c5c5ed0c3 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionResetPasswordTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionResetPasswordTest.java @@ -16,15 +16,13 @@ */ package org.keycloak.testsuite.actions; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import jakarta.mail.internet.MimeMessage; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.cookie.CookieType; import org.keycloak.events.Details; @@ -54,14 +52,18 @@ import org.keycloak.testsuite.util.URLUtils; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.Cookie; import org.openqa.selenium.WebDriver; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; - import static org.hamcrest.Matchers.contains; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTest.java index 75a2efc594b..6b3f9ec6bae 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTest.java @@ -17,9 +17,7 @@ package org.keycloak.testsuite.actions; import java.io.IOException; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.requiredactions.TermsAndConditions; import org.keycloak.models.UserModel; @@ -33,9 +31,14 @@ import org.keycloak.testsuite.pages.TermsAndConditionsPage; import org.keycloak.testsuite.updaters.UserAttributeUpdater; import org.keycloak.testsuite.util.GreenMailRule; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.actions.AbstractAppInitiatedActionTest.SUCCESS; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.actions.AbstractAppInitiatedActionTest.SUCCESS; /** * @author Hiroyuki Wada diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTotpSetupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTotpSetupTest.java index 3c869730970..cce3530aed2 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTotpSetupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionTotpSetupTest.java @@ -16,10 +16,11 @@ */ package org.keycloak.testsuite.actions; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Objects; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.authenticators.browser.RecoveryAuthnCodesFormAuthenticatorFactory; import org.keycloak.authentication.requiredactions.UpdateTotp; @@ -44,12 +45,12 @@ import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.openqa.selenium.By; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.openqa.selenium.By; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailTest.java index 21a7ab5e3dc..4f48cecb4d4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailTest.java @@ -20,15 +20,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.keycloak.userprofile.UserProfileConstants.ROLE_USER; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.events.Details; import org.keycloak.events.EventType; @@ -44,10 +35,21 @@ import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.util.DroneUtils; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.validate.validators.LengthValidator; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; import org.openqa.selenium.WebElement; import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.support.FindBy; +import static org.keycloak.userprofile.UserProfileConstants.ROLE_USER; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class AppInitiatedActionUpdateEmailTest extends AbstractAppInitiatedActionUpdateEmailTest { @FindBy(id = "update-email-btn") diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java index 7d288a3d750..1d4c39ca53d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateEmailWithVerificationTest.java @@ -16,20 +16,13 @@ */ package org.keycloak.testsuite.actions; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.IOException; + import jakarta.mail.Address; import jakarta.mail.Message; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; import org.keycloak.events.Details; @@ -41,9 +34,19 @@ import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.InfoPage; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.MailUtils; + +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class AppInitiatedActionUpdateEmailWithVerificationTest extends AbstractAppInitiatedActionUpdateEmailTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileTest.java index df102d6919c..b5886d32eb1 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionUpdateProfileTest.java @@ -16,15 +16,6 @@ */ package org.keycloak.testsuite.actions; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.anyOf; -import static org.hamcrest.Matchers.containsString; - -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import org.keycloak.events.Details; import org.keycloak.events.EventType; import org.keycloak.models.UserModel; @@ -36,6 +27,16 @@ import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginUpdateProfileEditUsernameAllowedPage; import org.keycloak.testsuite.util.UserBuilder; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.containsString; + /** * Only covers basic use cases for App Initialized actions. Complete dynamic user profile behavior is tested in {@link RequiredActionUpdateProfileWithUserProfileTest} as it shares same code as the App initialized action. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionVerifyEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionVerifyEmailTest.java index 1a68bced5a6..db2ff2c3baa 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionVerifyEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedActionVerifyEmailTest.java @@ -16,9 +16,6 @@ */ package org.keycloak.testsuite.actions; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Test; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; @@ -27,6 +24,10 @@ import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.VerifyEmailPage; import org.keycloak.testsuite.util.UserBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Test; + /** * Only covers basic use cases for App Initialized actions. Complete dynamic user profile behavior is tested in {@link RequiredActionUpdateProfileWithUserProfileTest} as it shares same code as the App initialized action. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedRegistrationTest.java index 77b0b1cfa97..44611fd13f9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/AppInitiatedRegistrationTest.java @@ -1,8 +1,5 @@ package org.keycloak.testsuite.actions; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Test; import org.keycloak.locale.LocaleSelectorProvider; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; @@ -12,6 +9,10 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.RegisterPage; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Test; + public class AppInitiatedRegistrationTest extends AbstractTestRealmKeycloakTest { @Page diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/DeleteAccountActionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/DeleteAccountActionTest.java index caaba471c4e..aa890416f2b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/DeleteAccountActionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/DeleteAccountActionTest.java @@ -4,11 +4,6 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.requiredactions.DeleteAccount; import org.keycloak.cookie.CookieType; @@ -26,6 +21,12 @@ import org.keycloak.testsuite.auth.page.login.DeleteAccountActionConfirmPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.UserBuilder; + +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.Cookie; public class DeleteAccountActionTest extends AbstractTestRealmKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java index c73e155098b..0aa766470b8 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionEmailVerificationTest.java @@ -16,14 +16,17 @@ */ package org.keycloak.testsuite.actions; -import org.jboss.arquillian.drone.api.annotation.Drone; +import java.io.Closeable; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.actiontoken.verifyemail.VerifyEmailActionToken; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.common.Profile; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.events.Details; @@ -39,52 +42,51 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.managers.AuthenticationSessionManager; import org.keycloak.sessions.RootAuthenticationSessionModel; -import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; +import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.cluster.AuthenticationSessionFailoverClusterTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; -import org.keycloak.testsuite.pages.ProceedPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.InfoPage; import org.keycloak.testsuite.pages.LoginPage; +import org.keycloak.testsuite.pages.ProceedPage; import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.pages.VerifyEmailPage; import org.keycloak.testsuite.pages.VerifyProfilePage; import org.keycloak.testsuite.updaters.UserAttributeUpdater; +import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; +import org.keycloak.testsuite.util.MailUtils; import org.keycloak.testsuite.util.SecondBrowser; -import org.keycloak.testsuite.util.UserBuilder; -import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.TestAppHelper; import org.keycloak.testsuite.util.UserActionTokenBuilder; -import org.keycloak.testsuite.util.MailUtils; - -import java.io.Closeable; -import jakarta.mail.MessagingException; -import jakarta.mail.internet.MimeMessage; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.OAuthClient; import org.hamcrest.Matchers; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; import org.junit.Assume; -import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; +import static org.keycloak.authentication.requiredactions.VerifyEmail.EMAIL_RESEND_COOLDOWN_KEY_PREFIX; + import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.keycloak.authentication.requiredactions.VerifyEmail.EMAIL_RESEND_COOLDOWN_KEY_PREFIX; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java index db7729a0633..589ca3bbda8 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionMultipleActionsTest.java @@ -16,24 +16,25 @@ */ package org.keycloak.testsuite.actions; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.events.Details; import org.keycloak.events.EventType; import org.keycloak.models.UserModel.RequiredAction; import org.keycloak.models.credential.PasswordCredentialModel; import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; +import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.pages.LoginUpdateProfileEditUsernameAllowedPage; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; + /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java index 54b2aeb68fd..933c2faa28e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java @@ -16,18 +16,8 @@ */ package org.keycloak.testsuite.actions; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.keycloak.testsuite.actions.RequiredActionEmailVerificationTest.getEmailLink; +import java.util.List; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.authentication.requiredactions.TermsAndConditions; import org.keycloak.events.Details; import org.keycloak.events.EventType; @@ -51,7 +41,19 @@ import org.keycloak.testsuite.pages.TermsAndConditionsPage; import org.keycloak.testsuite.pages.VerifyProfilePage; import org.keycloak.testsuite.util.GreenMailRule; -import java.util.List; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.actions.RequiredActionEmailVerificationTest.getEmailLink; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * @author Hiroyuki Wada diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java index 74dda6d66e7..f550ee70fb6 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionResetPasswordTest.java @@ -16,14 +16,10 @@ */ package org.keycloak.testsuite.actions; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; @@ -47,16 +43,21 @@ import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.pages.LoginUsernameOnlyPage; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.GreenMailRule; +import org.keycloak.testsuite.util.RealmManager; +import org.keycloak.testsuite.util.SecondBrowser; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.RealmManager; -import org.keycloak.testsuite.util.SecondBrowser; -import org.openqa.selenium.WebDriver; -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.openqa.selenium.WebDriver; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java index ee7b76a45a2..0bcc96f3d5d 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionTotpSetupTest.java @@ -16,14 +16,14 @@ */ package org.keycloak.testsuite.actions; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; @@ -61,17 +61,18 @@ import org.keycloak.testsuite.util.SecondBrowser; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; -import java.io.IOException; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTest.java index ca1b86d3081..c762b75eecd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTest.java @@ -16,22 +16,12 @@ */ package org.keycloak.testsuite.actions; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.keycloak.userprofile.UserProfileConstants.ROLE_USER; -import static org.keycloak.userprofile.UserProfileConstants.ROLE_ADMIN; - import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.admin.client.resource.UserResource; @@ -50,6 +40,19 @@ import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.userprofile.UserProfileConstants.ROLE_ADMIN; +import static org.keycloak.userprofile.UserProfileConstants.ROLE_USER; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class RequiredActionUpdateEmailTest extends AbstractRequiredActionUpdateEmailTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java index 6941a7e324c..f4670a337ec 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateEmailTestWithVerificationTest.java @@ -16,35 +16,17 @@ */ package org.keycloak.testsuite.actions; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; - -import jakarta.mail.Address; -import jakarta.mail.Message; -import jakarta.mail.MessagingException; -import jakarta.mail.internet.MimeMessage; - import java.io.IOException; import java.util.List; import java.util.Map; import java.util.UUID; +import jakarta.mail.Address; +import jakarta.mail.Message; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.core.Response.Status; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.actiontoken.updateemail.UpdateEmailActionToken; @@ -71,6 +53,26 @@ import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class RequiredActionUpdateEmailTestWithVerificationTest extends AbstractRequiredActionUpdateEmailTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java index 4233fb5b7ac..db268c1ee04 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileTest.java @@ -16,25 +16,14 @@ */ package org.keycloak.testsuite.actions; -import static org.hamcrest.Matchers.anyOf; -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertFalse; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; - import java.util.Arrays; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.events.Details; @@ -58,10 +47,23 @@ import org.keycloak.testsuite.pages.LoginUpdateProfileEditUsernameAllowedPage; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.userprofile.UserProfileContext; import org.keycloak.utils.StringUtil; -import java.util.HashSet; + +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.ElementClickInterceptedException; import org.openqa.selenium.htmlunit.HtmlUnitDriver; + +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; + import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertFalse; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java index f1b6c69147d..822977c8b01 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionUpdateProfileWithUserProfileTest.java @@ -16,31 +16,10 @@ */ package org.keycloak.testsuite.actions; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ALL; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_EDITABLE; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_ONLY; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.SCOPE_DEPARTMENT; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.VALIDATIONS_LENGTH; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.ATTRIBUTE_DEPARTMENT; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.CONFIGURATION_FOR_USER_EDIT; - import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.commons.lang3.StringUtils; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.events.Details; import org.keycloak.events.EventType; import org.keycloak.models.UserModel; @@ -61,9 +40,31 @@ import org.keycloak.testsuite.util.ClientScopeBuilder; import org.keycloak.testsuite.util.KeycloakModelUtils; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; + +import org.apache.commons.lang3.StringUtils; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.ATTRIBUTE_DEPARTMENT; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.CONFIGURATION_FOR_USER_EDIT; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_EDITABLE; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_ONLY; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ALL; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.SCOPE_DEPARTMENT; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.VALIDATIONS_LENGTH; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * Test update-profile required action with custom user profile configurations * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java index 12cad5177e8..3281d9b1ec5 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/actions/TermsAndConditionsTest.java @@ -16,12 +16,9 @@ */ package org.keycloak.testsuite.actions; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.List; +import java.util.Map; + import org.keycloak.authentication.requiredactions.TermsAndConditions; import org.keycloak.events.Details; import org.keycloak.events.Errors; @@ -43,13 +40,19 @@ import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; + +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.firefox.FirefoxDriver; -import java.util.List; -import java.util.Map; +import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -57,7 +60,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterClusteredTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterClusteredTest.java index 32fe70083eb..dff9d42bc29 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterClusteredTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterClusteredTest.java @@ -16,10 +16,6 @@ */ package org.keycloak.testsuite.adapter; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.APP_SERVER_CURRENT; - import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -28,6 +24,11 @@ import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; +import org.keycloak.testsuite.arquillian.ContainerInfo; +import org.keycloak.testsuite.auth.page.login.LoginActions; +import org.keycloak.testsuite.util.ContainerAssume; +import org.keycloak.testsuite.util.ServerURLs; + import io.undertow.Undertow; import io.undertow.server.handlers.ResponseCodeHandler; import io.undertow.server.handlers.proxy.LoadBalancingProxyClient; @@ -42,10 +43,11 @@ import org.junit.After; import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; -import org.keycloak.testsuite.arquillian.ContainerInfo; -import org.keycloak.testsuite.auth.page.login.LoginActions; -import org.keycloak.testsuite.util.ContainerAssume; -import org.keycloak.testsuite.util.ServerURLs; + +import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.APP_SERVER_CURRENT; + +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java index 06c005c9c15..25779ba7e6d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractAdapterTest.java @@ -17,10 +17,11 @@ package org.keycloak.testsuite.adapter; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.AfterClass; -import org.junit.Before; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; @@ -31,10 +32,10 @@ import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.AfterClass; +import org.junit.Before; import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.APP_SERVER_SSL_REQUIRED; import static org.keycloak.testsuite.arquillian.AppServerTestEnricher.CURRENT_APP_SERVER; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractSAMLAdapterClusteredTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractSAMLAdapterClusteredTest.java index b8ddac45e53..60f60a92852 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractSAMLAdapterClusteredTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractSAMLAdapterClusteredTest.java @@ -16,13 +16,6 @@ */ package org.keycloak.testsuite.adapter; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.admin.Users.setPasswordFor; -import static org.keycloak.testsuite.auth.page.AuthRealm.DEMO; -import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; - import java.net.URL; import java.util.List; import java.util.Map; @@ -30,15 +23,11 @@ import java.util.Optional; import java.util.function.BiConsumer; import java.util.stream.Collectors; -import org.apache.http.client.methods.HttpGet; -import org.jboss.arquillian.container.test.api.OperateOnDeployment; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.common.util.Retry; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.common.util.Retry; import org.keycloak.testsuite.adapter.page.EmployeeServletDistributable; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.ContainerInfo; @@ -48,6 +37,19 @@ import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.util.ServerURLs; +import org.apache.http.client.methods.HttpGet; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.Test; + +import static org.keycloak.testsuite.admin.Users.setPasswordFor; +import static org.keycloak.testsuite.auth.page.AuthRealm.DEMO; +import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java index 3b64ccb6adb..8b35fd95fc6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/AbstractServletsAdapterTest.java @@ -17,10 +17,13 @@ package org.keycloak.testsuite.adapter; -import org.apache.commons.io.IOUtils; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; +import java.io.IOException; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.List; + +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.adapter.filter.AdapterActionsFilter; import org.keycloak.testsuite.arquillian.AppServerTestEnricher; @@ -28,19 +31,18 @@ import org.keycloak.testsuite.util.DroneUtils; import org.keycloak.testsuite.utils.arquillian.DeploymentArchiveProcessorUtils; import org.keycloak.testsuite.utils.io.IOUtil; -import jakarta.ws.rs.core.UriBuilder; -import java.io.IOException; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.List; +import org.apache.commons.io.IOUtils; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.asset.UrlAsset; - +import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Assert; +import static org.keycloak.testsuite.auth.page.AuthRealm.DEMO; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; + import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.auth.page.AuthRealm.DEMO; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; public abstract class AbstractServletsAdapterTest extends AbstractAdapterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletAdapterTest.java index 216340e34ba..c870ceb3c2c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/AbstractSAMLServletAdapterTest.java @@ -1,11 +1,13 @@ package org.keycloak.testsuite.adapter.servlet; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.util.EntityUtils; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.admin.client.resource.ProtocolMappersResource; import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RealmRepresentation; @@ -17,12 +19,12 @@ import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.utils.io.IOUtil; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; import static org.keycloak.testsuite.admin.ApiUtil.getCreatedId; import static org.keycloak.testsuite.auth.page.AuthRealm.SAMLSERVLETDEMO; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java index bfa53ef3a8c..e0f1e328472 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLClockSkewAdapterTest.java @@ -18,13 +18,7 @@ package org.keycloak.testsuite.adapter.servlet; import java.util.List; -import org.apache.http.util.EntityUtils; -import org.hamcrest.Matcher; -import org.jboss.arquillian.container.test.api.Deployer; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; + import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.adapter.filter.AdapterActionsFilter; import org.keycloak.testsuite.adapter.page.SalesPostClockSkewServlet; @@ -33,13 +27,21 @@ import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; import org.keycloak.testsuite.utils.io.IOUtil; +import org.apache.http.util.EntityUtils; +import org.hamcrest.Matcher; +import org.jboss.arquillian.container.test.api.Deployer; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; + +import static org.keycloak.testsuite.util.SamlClient.Binding.POST; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; -import org.jboss.arquillian.graphene.page.Page; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.SamlClient.Binding.POST; @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java index decb16bc14a..f458c44fc45 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLoginResponseHandlingTest.java @@ -1,10 +1,13 @@ package org.keycloak.testsuite.adapter.servlet; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Assert; -import org.junit.Test; +import java.net.URI; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ProtocolMappersResource; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; @@ -28,18 +31,15 @@ import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Assert; +import org.junit.Test; import org.openqa.selenium.By; import org.w3c.dom.Document; -import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.admin.ApiUtil.getCreatedId; import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_PRIVATE_KEY; import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_PUBLIC_KEY; @@ -50,6 +50,9 @@ import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java index 6a4ad5ccb7a..9a11538708e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLLogoutAdapterTest.java @@ -1,5 +1,13 @@ package org.keycloak.testsuite.adapter.servlet; +import java.io.IOException; +import java.net.URI; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Consumer; + +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; @@ -19,23 +27,14 @@ import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.util.saml.CreateLogoutRequestStepBuilder; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; import org.keycloak.testsuite.utils.io.IOUtil; -import java.io.IOException; -import java.net.URI; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Consumer; -import jakarta.ws.rs.core.Response.Status; + import org.apache.http.HttpResponse; import org.apache.http.client.methods.CloseableHttpResponse; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.graphene.page.Page; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Test; -import static org.hamcrest.Matchers.anyOf; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; + import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlServletDeployment; import static org.keycloak.testsuite.adapter.servlet.SAMLServletAdapterTest.FORBIDDEN_TEXT; import static org.keycloak.testsuite.adapter.servlet.SAMLServletAdapterTest.WEBSPHERE_FORBIDDEN_TEXT; @@ -45,6 +44,12 @@ import static org.keycloak.testsuite.util.Matchers.isSamlResponse; import static org.keycloak.testsuite.util.SamlClient.Binding.POST; import static org.keycloak.testsuite.util.SamlClient.Binding.REDIRECT; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java index d20e4155263..2b341728f62 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletAdapterTest.java @@ -17,32 +17,6 @@ package org.keycloak.testsuite.adapter.servlet; -import static jakarta.ws.rs.core.Response.Status.OK; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.anyOf; -import static org.hamcrest.Matchers.arrayContaining; -import static org.hamcrest.Matchers.arrayContainingInAnyOrder; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.endsWith; -import static org.hamcrest.Matchers.equalToIgnoringCase; -import static org.hamcrest.Matchers.hasItems; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.keycloak.OAuth2Constants.PASSWORD; -import static org.keycloak.testsuite.admin.Users.getPasswordOf; -import static org.keycloak.testsuite.admin.Users.setPasswordFor; -import static org.keycloak.testsuite.auth.page.AuthRealm.DEMO; -import static org.keycloak.testsuite.auth.page.AuthRealm.SAMLSERVLETDEMO; -import static org.keycloak.testsuite.util.Matchers.bodyHC; -import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; -import static org.keycloak.testsuite.util.UIUtils.getRawPageSource; -import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; -import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.Closeable; @@ -57,6 +31,7 @@ import java.security.KeyPair; import java.security.PublicKey; import java.security.cert.Certificate; import java.security.cert.CertificateFactory; +import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.Base64; import java.util.Collections; @@ -69,24 +44,8 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; - -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.client.Invocation; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.Form; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.NewCookie; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriBuilderException; import javax.xml.XMLConstants; import javax.xml.namespace.QName; -import jakarta.xml.soap.MessageFactory; -import jakarta.xml.soap.SOAPHeader; -import jakarta.xml.soap.SOAPHeaderElement; -import jakarta.xml.soap.SOAPMessage; -import java.security.cert.X509Certificate; import javax.xml.transform.OutputKeys; import javax.xml.transform.Source; import javax.xml.transform.Transformer; @@ -102,26 +61,20 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathFactory; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.methods.RequestBuilder; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.util.EntityUtils; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; - -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Test; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.NewCookie; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPHeader; +import jakarta.xml.soap.SOAPHeaderElement; +import jakarta.xml.soap.SOAPMessage; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.KeycloakBuilder; @@ -206,8 +159,6 @@ import org.keycloak.testsuite.adapter.page.SalesPostSigServlet; import org.keycloak.testsuite.adapter.page.SalesPostSigTransientServlet; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; -import org.keycloak.testsuite.util.ServerURLs; -import org.keycloak.testsuite.utils.arquillian.ContainerConstants; import org.keycloak.testsuite.auth.page.login.Login; import org.keycloak.testsuite.auth.page.login.OneTimeCode; import org.keycloak.testsuite.auth.page.login.SAMLIDPInitiatedLogin; @@ -224,27 +175,73 @@ import org.keycloak.testsuite.updaters.UserAttributeUpdater; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.BrowserDriverUtil; import org.keycloak.testsuite.util.BrowserTabUtil; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; +import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.WaitUtils; +import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.keycloak.testsuite.utils.arquillian.ContainerConstants; import org.keycloak.testsuite.utils.io.IOUtil; +import org.apache.http.HttpResponse; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.client.methods.RequestBuilder; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.impl.client.BasicCookieStore; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.Cookie; import org.openqa.selenium.htmlunit.HtmlUnitDriver; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; - import org.xml.sax.SAXException; +import static jakarta.ws.rs.core.Response.Status.OK; + +import static org.keycloak.OAuth2Constants.PASSWORD; +import static org.keycloak.testsuite.admin.Users.getPasswordOf; +import static org.keycloak.testsuite.admin.Users.setPasswordFor; +import static org.keycloak.testsuite.auth.page.AuthRealm.DEMO; +import static org.keycloak.testsuite.auth.page.AuthRealm.SAMLSERVLETDEMO; +import static org.keycloak.testsuite.util.Matchers.bodyHC; +import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; +import static org.keycloak.testsuite.util.UIUtils.getRawPageSource; +import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; +import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.arrayContaining; +import static org.hamcrest.Matchers.arrayContainingInAnyOrder; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.equalToIgnoringCase; +import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; + /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java index 8067ac119b2..61d327b5e44 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SAMLServletSessionTimeoutTest.java @@ -1,9 +1,9 @@ package org.keycloak.testsuite.adapter.servlet; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; +import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; +import javax.xml.datatype.XMLGregorianCalendar; + import org.keycloak.common.Profile; import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; @@ -21,17 +21,19 @@ import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; -import javax.xml.datatype.XMLGregorianCalendar; -import java.util.Set; -import java.util.concurrent.atomic.AtomicReference; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_NAME; +import static org.keycloak.testsuite.util.Matchers.bodyHC; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_NAME; -import static org.keycloak.testsuite.util.Matchers.bodyHC; @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java index 58e098d1fd0..fb0e2c4b615 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlSignatureTest.java @@ -16,6 +16,15 @@ */ package org.keycloak.testsuite.adapter.servlet; +import java.net.URI; +import java.util.List; +import java.util.UUID; +import java.util.function.Consumer; +import java.util.stream.Collectors; +import javax.xml.crypto.dsig.XMLSignature; + +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.broker.saml.SAMLIdentityProviderFactory; @@ -34,37 +43,25 @@ import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.RolesBuilder; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; -import java.net.URI; -import java.util.List; -import java.util.UUID; -import java.util.function.Consumer; -import java.util.stream.Collectors; -import jakarta.ws.rs.core.Response.Status; -import javax.xml.crypto.dsig.XMLSignature; + import org.apache.http.client.methods.CloseableHttpResponse; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.graphene.page.Page; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Assert; import org.junit.Assume; import org.junit.Before; +import org.junit.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.hamcrest.Matchers.anyOf; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; + import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ASSERTION_NSURI; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.PROTOCOL_NSURI; import static org.keycloak.testsuite.adapter.AbstractServletsAdapterTest.samlServletDeployment; @@ -73,6 +70,14 @@ import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_PRIVATE_KEY; import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_PUBLIC_KEY; import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_SIGNING_CERTIFICATE; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlXMLAttacksTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlXMLAttacksTest.java index 7c85cbec3b1..d0d513e801b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlXMLAttacksTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/SamlXMLAttacksTest.java @@ -1,5 +1,19 @@ package org.keycloak.testsuite.adapter.servlet; +import java.io.IOException; +import java.net.URL; +import java.nio.charset.StandardCharsets; +import java.util.LinkedList; +import java.util.List; + +import jakarta.ws.rs.core.Response; + +import org.keycloak.saml.common.constants.GeneralConstants; +import org.keycloak.saml.processing.web.util.PostBindingUtil; +import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; +import org.keycloak.testsuite.saml.AbstractSamlTest; +import org.keycloak.testsuite.utils.arquillian.ContainerConstants; + import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; @@ -7,20 +21,6 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.message.BasicNameValuePair; -import org.junit.Test; -import org.keycloak.saml.common.constants.GeneralConstants; -import org.keycloak.saml.processing.web.util.PostBindingUtil; - -import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; -import org.keycloak.testsuite.saml.AbstractSamlTest; -import org.keycloak.testsuite.utils.arquillian.ContainerConstants; -import java.io.IOException; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.LinkedList; -import java.util.List; - -import jakarta.ws.rs.core.Response; import org.hamcrest.Matcher; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; @@ -28,11 +28,14 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; +import org.junit.Test; + import static org.keycloak.testsuite.util.Matchers.bodyHC; import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; + @AppServerContainer(ContainerConstants.APP_SERVER_WILDFLY) @AppServerContainer(ContainerConstants.APP_SERVER_EAP) @AppServerContainer(ContainerConstants.APP_SERVER_EAP8) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java index 66a22d452e1..dfd749416da 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/servlet/cluster/SAMLAdapterClusterTest.java @@ -17,15 +17,16 @@ package org.keycloak.testsuite.adapter.servlet.cluster; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.TargetsContainer; -import org.jboss.shrinkwrap.api.spec.WebArchive; import org.keycloak.testsuite.adapter.AbstractSAMLAdapterClusteredTest; import org.keycloak.testsuite.adapter.page.EmployeeServletDistributable; import org.keycloak.testsuite.adapter.servlet.SendUsernameServlet; import org.keycloak.testsuite.arquillian.annotation.AppServerContainer; import org.keycloak.testsuite.utils.arquillian.ContainerConstants; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.shrinkwrap.api.spec.WebArchive; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminClientTest.java index 24c5700e543..bce4c145db2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/admin/AdminClientTest.java @@ -19,12 +19,12 @@ package org.keycloak.testsuite.admin; import java.util.List; +import java.util.Map; +import java.util.Objects; + import jakarta.ws.rs.NotAuthorizedException; import jakarta.ws.rs.core.Response; -import java.util.Map; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.ClientResource; @@ -48,7 +48,10 @@ import org.keycloak.testsuite.util.ClientScopeBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.UserBuilder; -import java.util.Objects; + +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; /** * Test for the various "Advanced" scenarios of java admin-client diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractAuthzTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractAuthzTest.java index a7837e1bd2f..a2a88879b6a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractAuthzTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractAuthzTest.java @@ -1,12 +1,13 @@ package org.keycloak.testsuite.authz; -import org.junit.BeforeClass; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; import org.keycloak.representations.AccessToken; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.ProfileAssume; +import org.junit.BeforeClass; + import static org.keycloak.common.Profile.Feature.AUTHORIZATION; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractResourceServerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractResourceServerTest.java index c09fd19e2ba..cce24f963ac 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractResourceServerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AbstractResourceServerTest.java @@ -16,8 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertEquals; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -48,6 +46,8 @@ import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; +import static org.junit.Assert.assertEquals; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AttributeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AttributeTest.java index e2231e07f49..92ae0672bda 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AttributeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AttributeTest.java @@ -17,20 +17,22 @@ package org.keycloak.testsuite.authz; -import static java.util.Arrays.asList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Collection; import java.util.Map; import java.util.function.Consumer; +import org.keycloak.authorization.attribute.Attributes; + import org.apache.commons.collections.map.HashedMap; import org.junit.Test; -import org.keycloak.authorization.attribute.Attributes; + +import static java.util.Arrays.asList; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * @author Pedro Igor diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java index e2cdf28237b..01ff51532b2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationAPITest.java @@ -16,20 +16,12 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.Collections; import java.util.List; import jakarta.ws.rs.core.Response; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -55,6 +47,15 @@ import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java index cd45e852cc1..4e8e5b34c15 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthorizationTest.java @@ -16,10 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -27,10 +23,6 @@ import java.util.UUID; import jakarta.ws.rs.core.Response; -import org.jetbrains.annotations.NotNull; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -54,6 +46,15 @@ import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.jetbrains.annotations.NotNull; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java index c966fbbd5cd..2b1dbc7051a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientCredentialsTest.java @@ -16,13 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; @@ -31,8 +24,7 @@ import java.util.Collections; import java.util.List; import jakarta.ws.rs.core.Response; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; @@ -68,6 +60,16 @@ import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientTest.java index 884f925f649..2c9d7d617a7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/AuthzClientTest.java @@ -2,13 +2,14 @@ package org.keycloak.testsuite.authz; import java.io.ByteArrayInputStream; +import org.keycloak.authorization.client.AuthzClient; + import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.junit.contrib.java.lang.system.EnvironmentVariables; -import org.keycloak.authorization.client.AuthzClient; public class AuthzClientTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ClientScopePolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ClientScopePolicyTest.java index 7b3f2848ee9..2ced48c86af 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ClientScopePolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ClientScopePolicyTest.java @@ -16,15 +16,8 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; - import java.util.List; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientScopesResource; @@ -45,6 +38,14 @@ import org.keycloak.testsuite.util.ClientScopeBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + /** * @author Yoshiyuki Tabata */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ConflictingScopePermissionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ConflictingScopePermissionTest.java index 4e3434f59ab..4b2896407eb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ConflictingScopePermissionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ConflictingScopePermissionTest.java @@ -16,13 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -33,8 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -59,6 +50,16 @@ import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; +import org.junit.Before; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java index 7dc3eb2c563..5a0b6aa73cd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/EntitlementAPITest.java @@ -16,18 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -43,18 +31,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.apache.http.client.HttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.hamcrest.Matchers; -import org.jboss.arquillian.container.test.api.ContainerController; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jetbrains.annotations.NotNull; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; @@ -106,6 +84,30 @@ import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; +import org.apache.http.client.HttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; +import org.hamcrest.Matchers; +import org.jboss.arquillian.container.test.api.ContainerController; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.jetbrains.annotations.NotNull; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupNamePolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupNamePolicyTest.java index 01db04a55d1..e6fd91a600b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupNamePolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupNamePolicyTest.java @@ -16,9 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -27,8 +24,6 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -55,6 +50,12 @@ import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathPolicyTest.java index 1452a1058a7..1b73ba8ef6e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathPolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/GroupPathPolicyTest.java @@ -16,9 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -27,8 +24,6 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -55,6 +50,12 @@ import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java index d7c88d9941a..def646a392a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionClaimTest.java @@ -16,13 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -31,10 +24,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -60,6 +51,17 @@ import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.hamcrest.Matchers; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionEqualsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionEqualsTest.java index e96fda370fe..205f15c73b9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionEqualsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionEqualsTest.java @@ -17,16 +17,17 @@ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.util.Arrays; import java.util.Collections; import java.util.HashSet; -import org.junit.Test; import org.keycloak.representations.idm.authorization.Permission; +import org.junit.Test; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionManagementTest.java index 28bac12c9da..4eb78143b9c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PermissionManagementTest.java @@ -16,17 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -36,7 +25,6 @@ import java.util.Iterator; import java.util.List; import java.util.stream.Collectors; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ResourceScopesResource; import org.keycloak.authorization.client.AuthzClient; @@ -52,6 +40,19 @@ import org.keycloak.representations.idm.authorization.PermissionTicketToken; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationCompositeRoleTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationCompositeRoleTest.java index d00c8606c45..f10ea991edf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationCompositeRoleTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationCompositeRoleTest.java @@ -16,8 +16,10 @@ */ package org.keycloak.testsuite.authz; -import org.junit.Assert; -import org.junit.Test; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.AuthorizationProviderFactory; @@ -40,9 +42,8 @@ import org.keycloak.representations.idm.authorization.PolicyEvaluationResponse; import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.junit.Assert; +import org.junit.Test; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationTest.java index 4473a5ee5b3..914c8b08be6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/PolicyEvaluationTest.java @@ -16,13 +16,20 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; import jakarta.ws.rs.core.Response; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -71,17 +78,12 @@ import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; -import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; /** * @author Pedro Igor diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RegexPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RegexPolicyTest.java index d6a832d3e56..e07f31cd9b7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RegexPolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RegexPolicyTest.java @@ -21,9 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -51,6 +48,10 @@ import org.keycloak.testsuite.util.GroupBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java index 0c4c2036b16..6d7b344b728 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/RolePolicyTest.java @@ -16,14 +16,9 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - import java.util.Arrays; import java.util.List; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -51,6 +46,12 @@ import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ScriptCacheTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ScriptCacheTest.java index 2a562c42079..b270752596d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ScriptCacheTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/ScriptCacheTest.java @@ -17,15 +17,12 @@ package org.keycloak.testsuite.authz; -import static java.util.concurrent.TimeUnit.MILLISECONDS; -import static java.util.concurrent.locks.LockSupport.parkNanos; - import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import javax.script.ScriptContext; -import org.junit.Test; + import org.keycloak.authorization.policy.provider.js.ScriptCache; import org.keycloak.models.ScriptModel; import org.keycloak.models.utils.KeycloakModelUtils; @@ -33,6 +30,11 @@ import org.keycloak.scripting.EvaluatableScriptAdapter; import org.keycloak.scripting.ScriptBindingsConfigurer; import org.keycloak.scripting.ScriptExecutionException; +import org.junit.Test; + +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static java.util.concurrent.locks.LockSupport.parkNanos; + public class ScriptCacheTest { /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java index 86843166af1..28824574574 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaDiscoveryDocumentTest.java @@ -16,8 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertEquals; - import java.net.URI; import java.util.HashMap; import java.util.List; @@ -27,18 +25,21 @@ import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Test; import org.keycloak.authorization.config.UmaConfiguration; import org.keycloak.authorization.config.UmaWellKnownProviderFactory; import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.resources.RealmsResource; -import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AbstractAdminTest; +import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + public class UmaDiscoveryDocumentTest extends AbstractKeycloakTest { @ArquillianResource diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java index 8f58de6c52d..cab9ef08cd3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaGrantTypeTest.java @@ -16,17 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; - import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -43,13 +32,6 @@ import jakarta.ws.rs.core.Form; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.UriBuilder; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Before; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; @@ -71,11 +53,31 @@ import org.keycloak.representations.idm.authorization.ResourcePermissionRepresen import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; import org.keycloak.testsuite.util.AdminClientUtil; -import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.JsonSerialization; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaPermissionTicketPushedClaimsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaPermissionTicketPushedClaimsTest.java index 51ad4a96ddb..de92af654bf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaPermissionTicketPushedClaimsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaPermissionTicketPushedClaimsTest.java @@ -16,17 +16,10 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.fail; - import java.util.Collection; import java.util.Map; import java.util.Set; -import org.hamcrest.Matchers; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.authorization.client.AuthzClient; import org.keycloak.representations.AccessToken; @@ -39,6 +32,14 @@ import org.keycloak.representations.idm.authorization.PermissionResponse; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; +import org.hamcrest.Matchers; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaRepresentationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaRepresentationTest.java index e1427edd40c..47375e27ea0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaRepresentationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UmaRepresentationTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.authz; -import org.junit.Assert; -import org.junit.Test; +import java.util.List; +import java.util.Set; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authorization.client.resource.PermissionResource; import org.keycloak.representations.idm.UserRepresentation; @@ -29,8 +30,8 @@ import org.keycloak.representations.idm.authorization.PolicyEvaluationResponse; import org.keycloak.representations.idm.authorization.PolicyEvaluationResponse.PolicyResultRepresentation; import org.keycloak.representations.idm.authorization.ResourceRepresentation; -import java.util.List; -import java.util.Set; +import org.junit.Assert; +import org.junit.Test; public class UmaRepresentationTest extends AbstractResourceServerTest { private ResourceRepresentation resource; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedAccessTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedAccessTest.java index 12f9d8a6dac..02f40329dac 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedAccessTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedAccessTest.java @@ -16,20 +16,11 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.Arrays; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.authorization.client.AuthorizationDeniedException; @@ -50,6 +41,16 @@ import org.keycloak.representations.idm.authorization.ResourceServerRepresentati import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; import org.keycloak.testsuite.AssertEvents; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java index bbc4f0473aa..ba6c5a6669d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/UserManagedPermissionServiceTest.java @@ -16,13 +16,6 @@ */ package org.keycloak.testsuite.authz; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.authorization.model.Policy.FilterOption.OWNER; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -33,7 +26,6 @@ import java.util.UUID; import jakarta.ws.rs.NotFoundException; -import org.junit.Test; import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.client.AuthorizationDeniedException; @@ -70,6 +62,16 @@ import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Test; + +import static org.keycloak.authorization.model.Policy.FilterOption.OWNER; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractAuthorizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractAuthorizationTest.java index b39a10c2814..b0319fc3814 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractAuthorizationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractAuthorizationTest.java @@ -17,8 +17,10 @@ */ package org.keycloak.testsuite.authz.admin; -import org.junit.After; -import org.junit.BeforeClass; +import java.util.List; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ResourceScopeResource; @@ -27,18 +29,18 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.AbstractClientTest; +import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; -import jakarta.ws.rs.core.Response; +import org.junit.After; +import org.junit.BeforeClass; -import static org.junit.Assert.assertEquals; import static org.keycloak.common.Profile.Feature.AUTHORIZATION; -import java.util.List; +import static org.junit.Assert.assertEquals; /** * @author Pedro Igor diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractPolicyManagementTest.java index 847951aca26..b9cf62ac4c1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AbstractPolicyManagementTest.java @@ -16,12 +16,6 @@ */ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.keycloak.common.Profile.Feature.AUTHORIZATION; - import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; @@ -31,8 +25,6 @@ import java.util.function.Supplier; import jakarta.ws.rs.core.Response; -import org.junit.Before; -import org.junit.BeforeClass; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.admin.client.resource.RealmResource; @@ -48,6 +40,16 @@ import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Before; +import org.junit.BeforeClass; + +import static org.keycloak.common.Profile.Feature.AUTHORIZATION; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java index 1a1163c614d..fc507f8a6ec 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AggregatePolicyManagementTest.java @@ -16,15 +16,11 @@ */ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import java.util.Collections; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.Test; import org.keycloak.admin.client.resource.AggregatePoliciesResource; import org.keycloak.admin.client.resource.AggregatePolicyResource; import org.keycloak.admin.client.resource.AuthorizationResource; @@ -40,6 +36,11 @@ import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationDisabledInPreviewTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationDisabledInPreviewTest.java index 15a1b696748..c064e68ccae 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationDisabledInPreviewTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationDisabledInPreviewTest.java @@ -17,16 +17,17 @@ package org.keycloak.testsuite.authz.admin; -import org.junit.BeforeClass; -import org.junit.Test; -import org.keycloak.common.Profile; -import org.keycloak.testsuite.ProfileAssume; -import org.keycloak.testsuite.AbstractClientTest; -import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; - import jakarta.ws.rs.ServerErrorException; import jakarta.ws.rs.core.Response; +import org.keycloak.common.Profile; +import org.keycloak.testsuite.AbstractClientTest; +import org.keycloak.testsuite.ProfileAssume; +import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; + +import org.junit.BeforeClass; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationTest.java index 3526823d7b9..9d9a758d3cb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/AuthorizationTest.java @@ -18,8 +18,8 @@ package org.keycloak.testsuite.authz.admin; -import org.junit.Assert; -import org.junit.Test; +import java.util.List; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.constants.ServiceAccountConstants; @@ -31,7 +31,8 @@ import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; import org.keycloak.representations.idm.authorization.RolePolicyRepresentation; -import java.util.List; +import org.junit.Assert; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ClientPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ClientPolicyManagementTest.java index 151a9673c67..a3339ba01e6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ClientPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ClientPolicyManagementTest.java @@ -16,19 +16,12 @@ */ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.Collections; import java.util.stream.Collectors; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientPoliciesResource; import org.keycloak.admin.client.resource.ClientPolicyResource; @@ -42,6 +35,14 @@ import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ExportAuthorizationSettingsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ExportAuthorizationSettingsTest.java index 071326cf90a..fb38f52c0a7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ExportAuthorizationSettingsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ExportAuthorizationSettingsTest.java @@ -20,9 +20,10 @@ package org.keycloak.testsuite.authz.admin; import java.util.HashMap; import java.util.List; import java.util.Map; + import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.junit.Test; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.representations.idm.ClientRepresentation; @@ -35,6 +36,8 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RoleBuilder; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.notNullValue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GenericPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GenericPolicyManagementTest.java index 12509628591..61272dfaeb1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GenericPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GenericPolicyManagementTest.java @@ -17,7 +17,17 @@ */ package org.keycloak.testsuite.authz.admin; -import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.PoliciesResource; import org.keycloak.admin.client.resource.PolicyResource; @@ -33,15 +43,7 @@ import org.keycloak.representations.idm.authorization.ResourcePermissionRepresen import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import jakarta.ws.rs.core.Response; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GroupPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GroupPolicyManagementTest.java index 9b20ca8007d..cc9702dd230 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GroupPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/GroupPolicyManagementTest.java @@ -16,11 +16,6 @@ */ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.Arrays; import java.util.Collections; import java.util.UUID; @@ -29,7 +24,6 @@ import java.util.stream.Collectors; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.GroupPoliciesResource; import org.keycloak.admin.client.resource.GroupPolicyResource; @@ -44,6 +38,13 @@ import org.keycloak.representations.idm.authorization.PolicyRepresentation; import org.keycloak.testsuite.util.GroupBuilder; import org.keycloak.testsuite.util.RealmBuilder; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ImportAuthorizationSettingsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ImportAuthorizationSettingsTest.java index d478ef0209e..705427b22b6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ImportAuthorizationSettingsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ImportAuthorizationSettingsTest.java @@ -17,11 +17,6 @@ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; - - -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.representations.idm.RoleRepresentation; @@ -29,6 +24,11 @@ import org.keycloak.representations.idm.authorization.ResourceServerRepresentati import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + /** * * @author Pedro Igor diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/JSPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/JSPolicyManagementTest.java index 094a4b01f38..5bbad2dc632 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/JSPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/JSPolicyManagementTest.java @@ -16,15 +16,11 @@ */ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import java.util.Collections; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.JSPoliciesResource; import org.keycloak.admin.client.resource.JSPolicyResource; @@ -32,6 +28,11 @@ import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.JSPolicyRepresentation; import org.keycloak.representations.idm.authorization.Logic; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementTest.java index d36d31adccc..70dfee8d7dc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementTest.java @@ -18,7 +18,16 @@ package org.keycloak.testsuite.authz.admin; -import org.junit.Test; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ResourceResource; import org.keycloak.admin.client.resource.ResourcesResource; import org.keycloak.authorization.client.util.HttpResponseException; @@ -28,15 +37,7 @@ import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementWithAuthzClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementWithAuthzClientTest.java index 54cde5aefbf..2f86ce09d56 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementWithAuthzClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceManagementWithAuthzClientTest.java @@ -17,10 +17,6 @@ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; - import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -29,12 +25,17 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.hamcrest.Matchers; -import org.junit.Test; import org.keycloak.authorization.client.AuthzClient; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; +import org.hamcrest.Matchers; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + /** * * @author Pedro Igor diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourcePermissionManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourcePermissionManagementTest.java index b67be15845d..750f5ee6e0a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourcePermissionManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourcePermissionManagementTest.java @@ -16,15 +16,11 @@ */ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import java.util.Collections; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ResourcePermissionResource; import org.keycloak.admin.client.resource.ResourcePermissionsResource; @@ -32,6 +28,11 @@ import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.Logic; import org.keycloak.representations.idm.authorization.ResourcePermissionRepresentation; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceServerManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceServerManagementTest.java index c9eb2b22074..7f8503ed8ae 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceServerManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ResourceServerManagementTest.java @@ -17,7 +17,11 @@ package org.keycloak.testsuite.authz.admin; -import org.junit.Test; +import java.util.List; +import java.util.Objects; + +import jakarta.ws.rs.NotFoundException; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.models.utils.KeycloakModelUtils; @@ -31,8 +35,7 @@ import org.keycloak.representations.idm.authorization.ScopeRepresentation; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.util.JsonSerialization; -import java.util.List; -import java.util.Objects; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -40,8 +43,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import jakarta.ws.rs.NotFoundException; - /** * * @author Pedro Igor diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/RolePolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/RolePolicyManagementTest.java index 59266e1034c..2f3d85a2bb6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/RolePolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/RolePolicyManagementTest.java @@ -16,20 +16,14 @@ */ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.Collections; import java.util.stream.Collectors; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; - import jakarta.ws.rs.core.Response.Status; -import org.junit.Test; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.PolicyResource; @@ -49,6 +43,13 @@ import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.RolesBuilder; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopeManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopeManagementTest.java index 9880dab571d..2f58c5bed53 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopeManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopeManagementTest.java @@ -18,22 +18,23 @@ package org.keycloak.testsuite.authz.admin; -import org.junit.Test; +import java.util.List; +import java.util.UUID; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ResourceScopeResource; import org.keycloak.admin.client.resource.ResourcesResource; import org.keycloak.representations.idm.authorization.ResourceRepresentation; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; import org.keycloak.representations.idm.authorization.ScopeRepresentation; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.util.List; -import java.util.UUID; - /** * * @author Pedro Igor diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopePermissionManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopePermissionManagementTest.java index dd00323dce8..3f1666d2c9b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopePermissionManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/ScopePermissionManagementTest.java @@ -16,13 +16,9 @@ */ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ScopePermissionResource; import org.keycloak.admin.client.resource.ScopePermissionsResource; @@ -30,6 +26,11 @@ import org.keycloak.representations.idm.authorization.DecisionStrategy; import org.keycloak.representations.idm.authorization.Logic; import org.keycloak.representations.idm.authorization.ScopePermissionRepresentation; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/TimePolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/TimePolicyManagementTest.java index 3bc10f50b97..4ab063335ff 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/TimePolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/TimePolicyManagementTest.java @@ -16,27 +16,28 @@ */ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import java.util.Collections; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; - import jakarta.ws.rs.core.Response.Status; -import org.junit.Test; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.TimePoliciesResource; import org.keycloak.admin.client.resource.TimePolicyResource; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.OAuth2ErrorRepresentation; import org.keycloak.representations.idm.authorization.DecisionStrategy; -import org.keycloak.representations.idm.authorization.TimePolicyRepresentation; import org.keycloak.representations.idm.authorization.Logic; +import org.keycloak.representations.idm.authorization.TimePolicyRepresentation; import org.keycloak.testsuite.Assert; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/UserPolicyManagementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/UserPolicyManagementTest.java index e62cfef5a5c..c4889110c91 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/UserPolicyManagementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/UserPolicyManagementTest.java @@ -16,11 +16,6 @@ */ package org.keycloak.testsuite.authz.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -29,8 +24,6 @@ import java.util.stream.Collectors; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.PolicyResource; import org.keycloak.admin.client.resource.UserPoliciesResource; @@ -45,6 +38,14 @@ import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Assert; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/permissions/ExportImportTestFGAPV2.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/permissions/ExportImportTestFGAPV2.java index 32cfadecf12..753d8dcc8c2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/permissions/ExportImportTestFGAPV2.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/authz/admin/permissions/ExportImportTestFGAPV2.java @@ -16,6 +16,16 @@ */ package org.keycloak.testsuite.authz.admin.permissions; +import java.util.List; + +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; +import org.keycloak.testsuite.exportimport.ExportImportTest; + +import org.junit.After; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; @@ -23,14 +33,6 @@ import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import java.util.List; -import org.junit.After; -import org.junit.Test; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.representations.idm.authorization.ResourceServerRepresentation; -import org.keycloak.testsuite.exportimport.ExportImportTest; - public class ExportImportTestFGAPV2 extends ExportImportTest { private final String REALM_NAME = "fgap"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java index 4743e694909..5077a2d7e3b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedBrokerTest.java @@ -1,7 +1,19 @@ package org.keycloak.testsuite.broker; -import org.junit.Rule; -import org.junit.Test; +import java.net.URI; +import java.util.Arrays; +import java.util.Collections; +import java.util.Set; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; @@ -24,33 +36,14 @@ import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.ClientBuilder; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.TestAppHelper; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.TimeoutException; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.ClientRequestFilter; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.Arrays; -import java.util.Collections; -import java.util.Set; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; - -import static org.hamcrest.Matchers.hasItems; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; import static org.keycloak.testsuite.admin.ApiUtil.removeUserByUsername; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.configurePostBrokerLoginWithOTP; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.disablePostBrokerLoginFlow; @@ -61,6 +54,16 @@ import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForElementEnabled; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeFalse; + /** * Test of advanced functionalities related to brokering like: * - Account management linking diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedRoleMapperTest.java index e907b28da04..86b0612fdf0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractAdvancedRoleMapperTest.java @@ -1,17 +1,17 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; -import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; +import java.util.List; +import java.util.Map; -import org.junit.Test; import org.keycloak.models.IdentityProviderMapperSyncMode; import org.keycloak.representations.idm.UserRepresentation; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.junit.Test; -import java.util.List; -import java.util.Map; +import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; +import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; /** * @author hmlnarik, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java index bae2ef2e133..8611b87d08d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBaseBrokerTest.java @@ -17,13 +17,15 @@ package org.keycloak.testsuite.broker; +import java.net.URI; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriBuilderException; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Before; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.util.Retry; import org.keycloak.models.utils.TimeBasedOTP; @@ -57,16 +59,14 @@ import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.LogoutUrlBuilder; import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; + +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Before; import org.openqa.selenium.By; import org.openqa.selenium.TimeoutException; -import java.net.URI; -import java.util.Collections; -import java.util.List; -import java.util.Objects; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword; import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; @@ -77,6 +77,9 @@ import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; import static org.keycloak.testsuite.util.ServerURLs.removeDefaultPorts; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; + /** * No test methods there. Just some useful common functionality */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBrokerTest.java index f02683f3440..9599c09eb6e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractBrokerTest.java @@ -1,7 +1,13 @@ package org.keycloak.testsuite.broker; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Test; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.admin.client.resource.UsersResource; @@ -20,14 +26,13 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.pages.ConsentPage; import org.keycloak.testsuite.util.AccountHelper; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Test; + +import static org.keycloak.models.utils.DefaultAuthenticationFlows.IDP_REVIEW_PROFILE_CONFIG_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; @@ -35,9 +40,6 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.keycloak.models.utils.DefaultAuthenticationFlows.IDP_REVIEW_PROFILE_CONFIG_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; /** * Contains just few basic tests. This is good class to override if you're testing custom IDP configuration and you need diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractDefaultIdpTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractDefaultIdpTest.java index 82db0f662ab..0f422ea3d0e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractDefaultIdpTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractDefaultIdpTest.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.UUID; import java.util.stream.IntStream; -import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.authenticators.browser.IdentityProviderAuthenticatorFactory; import org.keycloak.models.AuthenticationExecutionModel; @@ -33,14 +32,17 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.UIUtils; + +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; /** * Test for scenarios where "Identity Provider Authenticator" is set with "default identity provider" directly redirecting to provider realm diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java index c1fbceb4b51..6abe2ca32a3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractFirstBrokerLoginTest.java @@ -5,12 +5,6 @@ import java.util.List; import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.core.Response; -import com.google.common.collect.ImmutableMap; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; @@ -42,16 +36,19 @@ import org.keycloak.testsuite.util.MailServer; import org.keycloak.testsuite.util.MailServerConfiguration; import org.keycloak.testsuite.util.SecondBrowser; import org.keycloak.userprofile.UserProfileContext; + +import com.google.common.collect.ImmutableMap; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.PageFactory; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertTrue; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; import static org.keycloak.testsuite.admin.ApiUtil.removeUserByUsername; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.assertHardCodedSessionNote; @@ -63,6 +60,11 @@ import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; import static org.keycloak.testsuite.util.MailAssert.assertEmailAndGetUrl; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.startsWith; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * Test of various scenarios related to first broker login. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupBrokerMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupBrokerMapperTest.java index 8494e543b40..14af7b7701a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupBrokerMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupBrokerMapperTest.java @@ -17,18 +17,19 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; - import java.io.IOException; import java.util.List; import java.util.Map; -import org.junit.Test; import org.keycloak.models.IdentityProviderMapperSyncMode; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.junit.Test; + +import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; public abstract class AbstractGroupBrokerMapperTest extends AbstractGroupMapperTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupMapperTest.java index 6714f9df578..a00b0faf097 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractGroupMapperTest.java @@ -1,12 +1,12 @@ package org.keycloak.testsuite.broker; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.not; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; -import org.junit.Before; import org.keycloak.admin.client.CreatedResponseUtil; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.models.IdentityProviderMapperSyncMode; @@ -15,15 +15,16 @@ import org.keycloak.representations.idm.GroupRepresentation; import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; - -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -import jakarta.ws.rs.core.Response; import org.keycloak.testsuite.util.AccountHelper; +import org.junit.Before; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.not; + /** * @author Artur Baltabayev, * Daniel Fesenmeyer diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderMapperTest.java index c1499c513a0..8afc3bef3c6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractIdentityProviderMapperTest.java @@ -1,6 +1,10 @@ package org.keycloak.testsuite.broker; -import org.junit.Before; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.representations.idm.IdentityProviderRepresentation; @@ -9,15 +13,13 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.util.UserBuilder; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import org.junit.Before; +import static org.keycloak.testsuite.admin.ApiUtil.createUserAndResetPasswordWithAdminClient; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.admin.ApiUtil.createUserAndResetPasswordWithAdminClient; /** * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractInitializedBaseBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractInitializedBaseBrokerTest.java index bbcd54f4e57..69e0e44018b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractInitializedBaseBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractInitializedBaseBrokerTest.java @@ -16,7 +16,7 @@ */ package org.keycloak.testsuite.broker; -import org.junit.Before; +import java.util.function.BiConsumer; import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.IdentityProviderResource; @@ -24,7 +24,8 @@ import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.utils.DefaultAuthenticationFlows; import org.keycloak.representations.idm.AuthenticationExecutionInfoRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import java.util.function.BiConsumer; + +import org.junit.Before; import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcOidcBrokerLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcOidcBrokerLogoutTest.java index 9c6a6a7e4dd..80fda657d7c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcOidcBrokerLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcOidcBrokerLogoutTest.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.broker; -import org.junit.Before; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.UserRepresentation; +import org.junit.Before; + import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcSamlEncryptedElementsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcSamlEncryptedElementsTest.java index 1bb3716f643..2a54a5f9c65 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcSamlEncryptedElementsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcSamlEncryptedElementsTest.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.broker; -import org.apache.xml.security.encryption.XMLCipher; -import org.apache.xml.security.utils.EncryptionConstants; -import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; +import java.security.PublicKey; +import java.util.concurrent.atomic.AtomicReference; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.util.PemUtils; import org.keycloak.crypto.Algorithm; @@ -38,20 +38,23 @@ import org.keycloak.testsuite.util.KeyUtils; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.util.saml.SamlDocumentStepBuilder; + +import org.apache.xml.security.encryption.XMLCipher; +import org.apache.xml.security.utils.EncryptionConstants; +import org.hamcrest.Matchers; +import org.junit.Before; +import org.junit.Test; import org.w3c.dom.Document; -import jakarta.ws.rs.core.Response; -import java.security.PublicKey; -import java.util.concurrent.atomic.AtomicReference; +import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; +import static org.keycloak.testsuite.saml.AbstractSamlTest.SAML_CLIENT_ID_SALES_POST; +import static org.keycloak.testsuite.util.Matchers.isSamlResponse; +import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.not; -import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; -import static org.keycloak.testsuite.saml.AbstractSamlTest.SAML_CLIENT_ID_SALES_POST; -import static org.keycloak.testsuite.util.Matchers.isSamlResponse; -import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; public abstract class AbstractKcSamlEncryptedElementsTest extends AbstractBrokerTest { @@ -151,5 +154,3 @@ public abstract class AbstractKcSamlEncryptedElementsTest extends AbstractBroker } } - - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcSamlMetadataBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcSamlMetadataBrokerTest.java index c3cf441c00e..4c5cdce6cd3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcSamlMetadataBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractKcSamlMetadataBrokerTest.java @@ -16,11 +16,10 @@ */ package org.keycloak.testsuite.broker; -import jakarta.ws.rs.core.Response; import java.util.List; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Assert; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; @@ -37,6 +36,10 @@ import org.keycloak.testsuite.saml.AbstractSamlTest; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.util.saml.SamlDocumentStepBuilder; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractNestedBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractNestedBrokerTest.java index 92599ed23cb..5ef6a3cc25d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractNestedBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractNestedBrokerTest.java @@ -1,10 +1,10 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; - import org.junit.After; import org.junit.Before; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + public abstract class AbstractNestedBrokerTest extends AbstractBaseBrokerTest { protected NestedBrokerConfiguration nbc = getNestedBrokerConfiguration(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractRoleMapperTest.java index 399b980df99..d891afb07dc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractRoleMapperTest.java @@ -1,18 +1,11 @@ package org.keycloak.testsuite.broker; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.aMapWithSize; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasEntry; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.in; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; -import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.CreatedResponseUtil; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.RealmResource; @@ -28,11 +21,19 @@ import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RoleBuilder; -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; +import org.hamcrest.Matchers; +import org.junit.Before; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.aMapWithSize; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasEntry; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.in; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; /** * @author hmlnarik, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractSamlLoginHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractSamlLoginHintTest.java index 87193b06445..97f04fa6733 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractSamlLoginHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractSamlLoginHintTest.java @@ -1,14 +1,16 @@ package org.keycloak.testsuite.broker; -import org.junit.Test; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.testsuite.Assert; + +import org.junit.Test; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebElement; -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.junit.Assert.assertEquals; + /** * Test of various scenarios related to the use of login hint */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUserAttributeMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUserAttributeMapperTest.java index 5ba26a8ccb8..f25fda1c2ac 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUserAttributeMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUserAttributeMapperTest.java @@ -1,28 +1,29 @@ package org.keycloak.testsuite.broker; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.broker.KcSamlBrokerConfiguration.ATTRIBUTE_TO_MAP_FRIENDLY_NAME; - import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.junit.Test; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.models.IdentityProviderMapperSyncMode; import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.util.AccountHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import org.keycloak.testsuite.util.AccountHelper; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.KcSamlBrokerConfiguration.ATTRIBUTE_TO_MAP_FRIENDLY_NAME; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUsernameTemplateMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUsernameTemplateMapperTest.java index 6905c7137f1..3508ccf3fb1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUsernameTemplateMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AbstractUsernameTemplateMapperTest.java @@ -1,21 +1,22 @@ package org.keycloak.testsuite.broker; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; -import static org.keycloak.testsuite.broker.KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME; - import java.util.List; -import org.junit.Test; import org.keycloak.models.IdentityProviderMapperSyncMode; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; +import org.keycloak.testsuite.util.AccountHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.keycloak.testsuite.util.AccountHelper; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.keycloak.testsuite.broker.KcOidcBrokerConfiguration.ATTRIBUTE_TO_MAP_NAME; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; /** * @author Martin Idel, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java index af89de21944..57221e8541f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AccountLinkTest.java @@ -17,11 +17,10 @@ package org.keycloak.testsuite.broker; import java.util.Collections; +import java.util.List; + import jakarta.ws.rs.core.Response; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.admin.client.resource.UsersResource; @@ -44,20 +43,23 @@ import org.keycloak.testsuite.federation.UserMapStorageFactory; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.UpdateAccountInformationPage; +import org.keycloak.testsuite.runonserver.RunOnServer; +import org.keycloak.testsuite.util.AccountHelper; +import org.keycloak.testsuite.util.FederatedIdentityBuilder; -import java.util.List; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; +import static org.keycloak.testsuite.admin.ApiUtil.createUserAndResetPasswordWithAdminClient; +import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; -import static org.keycloak.testsuite.admin.ApiUtil.createUserAndResetPasswordWithAdminClient; -import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; - -import org.keycloak.testsuite.runonserver.RunOnServer; -import org.keycloak.testsuite.util.AccountHelper; -import org.keycloak.testsuite.util.FederatedIdentityBuilder; /** * @author Bill Burke diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AttributeToRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AttributeToRoleMapperTest.java index f28a1c6c498..ecc8be89316 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AttributeToRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/AttributeToRoleMapperTest.java @@ -1,9 +1,8 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; -import static org.keycloak.models.IdentityProviderMapperSyncMode.LEGACY; +import java.util.List; +import java.util.Map; -import org.junit.Test; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.broker.saml.mappers.AttributeToRoleMapper; import org.keycloak.broker.saml.mappers.UserAttributeMapper; @@ -13,9 +12,10 @@ import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.junit.Test; -import java.util.List; -import java.util.Map; +import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; +import static org.keycloak.models.IdentityProviderMapperSyncMode.LEGACY; /** * @author Martin Idel diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerConfiguration.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerConfiguration.java index e21224c408e..addae8a82bf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerConfiguration.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerConfiguration.java @@ -1,12 +1,12 @@ package org.keycloak.testsuite.broker; +import java.util.List; + import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.List; - /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerRunOnServerUtil.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerRunOnServerUtil.java index 9e493fd844d..c8b7b76acfb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerRunOnServerUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerRunOnServerUtil.java @@ -16,8 +16,6 @@ */ package org.keycloak.testsuite.broker; -import static org.junit.Assert.assertEquals; - import org.keycloak.authentication.authenticators.broker.IdpAutoLinkAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; @@ -34,6 +32,8 @@ import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.runonserver.RunOnServer; import org.keycloak.testsuite.util.FlowUtil; +import static org.junit.Assert.assertEquals; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerTestTools.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerTestTools.java index f6ef80fde3e..526d7162faa 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerTestTools.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerTestTools.java @@ -1,16 +1,5 @@ package org.keycloak.testsuite.broker; -import org.apache.http.client.utils.URIBuilder; -import org.keycloak.admin.client.Keycloak; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.IdentityProviderRepresentation; -import org.keycloak.testsuite.pages.PageUtils; -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.ui.ExpectedCondition; -import org.openqa.selenium.support.ui.WebDriverWait; - import java.net.URI; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -19,10 +8,22 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import org.keycloak.admin.client.Keycloak; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.IdentityProviderRepresentation; +import org.keycloak.testsuite.pages.PageUtils; + +import org.apache.http.client.utils.URIBuilder; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.ExpectedCondition; +import org.openqa.selenium.support.ui.WebDriverWait; + import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_HOST2; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerWithLegacyIdTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerWithLegacyIdTest.java index 396a373cb7f..f7f8540c71d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerWithLegacyIdTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/BrokerWithLegacyIdTest.java @@ -17,7 +17,8 @@ package org.keycloak.testsuite.broker; -import org.junit.Test; +import java.util.List; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.models.IdentityProviderSyncMode; @@ -29,13 +30,14 @@ import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.FederatedIdentityBuilder; import org.keycloak.testsuite.util.UserBuilder; -import java.util.List; +import org.junit.Test; -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.oidc.LegacyIdIdentityProvider.LEGACY_ID; +import static org.junit.Assert.assertEquals; + /** * @author Vaclav Muzikar */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/ExternalKeycloakRoleToRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/ExternalKeycloakRoleToRoleMapperTest.java index ec8d6c1fc08..1aa01927f12 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/ExternalKeycloakRoleToRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/ExternalKeycloakRoleToRoleMapperTest.java @@ -1,11 +1,9 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; -import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; -import static org.keycloak.models.IdentityProviderMapperSyncMode.LEGACY; +import java.util.Collections; +import java.util.List; +import java.util.Map; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.broker.oidc.mappers.ExternalKeycloakRoleToRoleMapper; import org.keycloak.broker.provider.ConfigConstants; @@ -15,10 +13,12 @@ import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import com.google.common.collect.ImmutableMap; +import org.junit.Before; +import org.junit.Test; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; +import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; +import static org.keycloak.models.IdentityProviderMapperSyncMode.LEGACY; /** * @author Martin Idel, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/HardcodedRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/HardcodedRoleMapperTest.java index ddf893777e1..0ab7f22aa3b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/HardcodedRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/HardcodedRoleMapperTest.java @@ -1,11 +1,9 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; -import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; -import static org.keycloak.models.IdentityProviderMapperSyncMode.LEGACY; +import java.util.Collections; +import java.util.List; +import java.util.Map; -import org.junit.Before; -import org.junit.Test; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.broker.provider.HardcodedRoleMapper; import org.keycloak.models.IdentityProviderMapperModel; @@ -13,10 +11,12 @@ import org.keycloak.models.IdentityProviderMapperSyncMode; import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import com.google.common.collect.ImmutableMap; +import org.junit.Before; +import org.junit.Test; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; +import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; +import static org.keycloak.models.IdentityProviderMapperSyncMode.LEGACY; /** * @author Martin Idel, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/HardcodedUserAttributeMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/HardcodedUserAttributeMapperTest.java index 862bd533f10..04d1eb22454 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/HardcodedUserAttributeMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/HardcodedUserAttributeMapperTest.java @@ -1,14 +1,7 @@ package org.keycloak.testsuite.broker; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; -import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; - import java.util.HashMap; -import org.junit.Test; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.broker.provider.HardcodedAttributeMapper; import org.keycloak.models.IdentityProviderMapperModel; @@ -16,9 +9,17 @@ import org.keycloak.models.IdentityProviderMapperSyncMode; import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.util.AccountHelper; import com.google.common.collect.ImmutableMap; -import org.keycloak.testsuite.util.AccountHelper; +import org.junit.Test; + +import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; +import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.not; /** * Martin Idel, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/JsonUserAttributeMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/JsonUserAttributeMapperTest.java index e83e825e3c8..71638997c77 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/JsonUserAttributeMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/JsonUserAttributeMapperTest.java @@ -1,7 +1,7 @@ package org.keycloak.testsuite.broker; -import com.google.common.collect.ImmutableMap; -import org.junit.Test; +import java.util.HashMap; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.ProtocolMappersResource; import org.keycloak.broker.oidc.mappers.AbstractJsonUserAttributeMapper; @@ -16,12 +16,9 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.social.github.GitHubUserAttributeMapper; import org.keycloak.testsuite.util.AccountHelper; -import java.util.HashMap; +import com.google.common.collect.ImmutableMap; +import org.junit.Test; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; import static org.keycloak.models.IdentityProviderMapperSyncMode.LEGACY; @@ -29,6 +26,11 @@ import static org.keycloak.testsuite.broker.KcOidcBrokerConfiguration.HARDOCDED_ import static org.keycloak.testsuite.broker.KcOidcBrokerConfiguration.HARDOCDED_VALUE; import static org.keycloak.testsuite.broker.KcOidcBrokerConfiguration.USER_INFO_CLAIM; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; + /** * @author Martin Idel */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcCustomOidcBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcCustomOidcBrokerTest.java index 6b3ccdef467..e50d1ec2d4d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcCustomOidcBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcCustomOidcBrokerTest.java @@ -16,13 +16,15 @@ */ package org.keycloak.testsuite.broker; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; - -import org.junit.Test; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.testsuite.broker.oidc.TestKeycloakOidcIdentityProviderFactory; + +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOIDCBrokerWithSignatureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOIDCBrokerWithSignatureTest.java index 93aa577a615..8f87a1b7452 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOIDCBrokerWithSignatureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOIDCBrokerWithSignatureTest.java @@ -19,12 +19,10 @@ package org.keycloak.testsuite.broker; import java.io.Closeable; import java.nio.charset.StandardCharsets; + import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import org.junit.Before; -import org.junit.Test; - import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.KeyUtils; @@ -50,12 +48,16 @@ import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.broker.OIDCIdentityProviderConfigRep; import org.keycloak.testsuite.util.oauth.OAuthClient; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; +import org.junit.Before; +import org.junit.Test; + import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcAccessTokenOnlyClaimsUserAttributeMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcAccessTokenOnlyClaimsUserAttributeMapperTest.java index aa36a4c0b6a..a0be618f457 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcAccessTokenOnlyClaimsUserAttributeMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcAccessTokenOnlyClaimsUserAttributeMapperTest.java @@ -1,6 +1,7 @@ package org.keycloak.testsuite.broker; import java.util.List; + import org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerAcrParameterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerAcrParameterTest.java index 9feb2636c89..7c2f360f7d1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerAcrParameterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerAcrParameterTest.java @@ -1,11 +1,11 @@ package org.keycloak.testsuite.broker; +import java.util.List; + import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; -import java.util.List; - import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; public class KcOidcBrokerAcrParameterTest extends AbstractBrokerTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretBasicAuthTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretBasicAuthTest.java index 1a6f4201ce0..ebe74c0f5e5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretBasicAuthTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretBasicAuthTest.java @@ -1,12 +1,11 @@ package org.keycloak.testsuite.broker; +import java.util.Map; + import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import java.util.Map; - - import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretJwtCustomSignAlgTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretJwtCustomSignAlgTest.java index 10c5e26f00e..c7ee351a48a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretJwtCustomSignAlgTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretJwtCustomSignAlgTest.java @@ -1,9 +1,5 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; -import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -17,6 +13,10 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; +import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; + public class KcOidcBrokerClientSecretJwtCustomSignAlgTest extends AbstractBrokerTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretJwtTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretJwtTest.java index 4194fcbf153..937b4b4db1b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretJwtTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerClientSecretJwtTest.java @@ -1,9 +1,5 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; -import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; - import java.util.List; import java.util.Map; @@ -13,6 +9,10 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; +import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; + public class KcOidcBrokerClientSecretJwtTest extends AbstractBrokerTest { // BCFIPS approved mode requires at least 112 bits (14 characters) long SecretKey for "client-secret-jwt" authentication diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerColonAliasClientSecretBasicAuthTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerColonAliasClientSecretBasicAuthTest.java index 087b64923a8..41132c97573 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerColonAliasClientSecretBasicAuthTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerColonAliasClientSecretBasicAuthTest.java @@ -17,14 +17,14 @@ package org.keycloak.testsuite.broker; +import java.util.Map; + import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import java.util.Map; - import static org.keycloak.broker.oidc.OAuth2IdentityProviderConfig.TOKEN_ENDPOINT_URL; import static org.keycloak.testsuite.broker.BrokerTestConstants.CLIENT_SECRET; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerConfiguration.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerConfiguration.java index 42a33b4629a..edd0cd869bd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerConfiguration.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerConfiguration.java @@ -1,5 +1,11 @@ package org.keycloak.testsuite.broker; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.IdentityProviderSyncMode; @@ -16,12 +22,6 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; - import static org.keycloak.broker.oidc.OAuth2IdentityProviderConfig.TOKEN_ENDPOINT_URL; import static org.keycloak.testsuite.broker.BrokerTestConstants.CLIENT_ID; import static org.keycloak.testsuite.broker.BrokerTestConstants.CLIENT_SECRET; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerEventTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerEventTest.java index 21070113bf7..bc0a802bb3b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerEventTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerEventTest.java @@ -18,10 +18,7 @@ package org.keycloak.testsuite.broker; import java.util.List; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.events.Details; import org.keycloak.events.EventType; @@ -29,6 +26,11 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; import org.keycloak.userprofile.UserProfileContext; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; + import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerFrontendUrlTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerFrontendUrlTest.java index bb491b52a40..7df51467069 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerFrontendUrlTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerFrontendUrlTest.java @@ -1,10 +1,5 @@ package org.keycloak.testsuite.broker; -import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; - import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -12,13 +7,20 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.util.ReverseProxy; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + +import static org.junit.Assert.assertTrue; + public final class KcOidcBrokerFrontendUrlTest extends AbstractBrokerTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerHiddenIdpHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerHiddenIdpHintTest.java index f9ddec86cfa..e46bb0250f6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerHiddenIdpHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerHiddenIdpHintTest.java @@ -17,16 +17,17 @@ package org.keycloak.testsuite.broker; import java.util.Map; -import org.junit.Test; + import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; - import org.keycloak.testsuite.Assert; +import org.junit.Test; + import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; /** * Migrated from old testsuite. Previous version by Pedro Igor. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpHintTest.java index a43e186ff43..f2fabe4f486 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpHintTest.java @@ -16,11 +16,12 @@ */ package org.keycloak.testsuite.broker; -import org.junit.Test; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; - import org.keycloak.testsuite.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + /** * Migrated from old testsuite. Previous version by Pedro Igor. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpLinkActionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpLinkActionTest.java index d411d1dfca2..d4398cf7c24 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpLinkActionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpLinkActionTest.java @@ -25,11 +25,7 @@ import java.util.Collections; import java.util.List; import jakarta.ws.rs.core.Response; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.RequiredActionContext; import org.keycloak.broker.provider.IdpLinkAction; @@ -52,9 +48,16 @@ import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.utils.BrokerUtil; -import static org.hamcrest.Matchers.is; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.hamcrest.Matchers.is; + /** * Test for client-initiated-account linking of the custom application * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpPublicKeyMissingUseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpPublicKeyMissingUseTest.java index dd0b3e20317..27681e55681 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpPublicKeyMissingUseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerIdpPublicKeyMissingUseTest.java @@ -1,13 +1,12 @@ package org.keycloak.testsuite.broker; +import java.util.Map; + import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import java.util.Map; - - import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerJWETest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerJWETest.java index 13cf24c5f98..2eb9d7e43f4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerJWETest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerJWETest.java @@ -16,17 +16,11 @@ */ package org.keycloak.testsuite.broker; -import static java.util.Optional.ofNullable; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Predicate; -import com.google.common.collect.ImmutableMap; -import org.junit.Test; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.ProtocolMappersResource; @@ -54,6 +48,14 @@ import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import com.google.common.collect.ImmutableMap; +import org.junit.Test; + +import static java.util.Optional.ofNullable; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + /** *

Tests the broker using a JWE encrypted token for id token and user info. The test * can be extended to use different algorithms. The default uses RSA-OAEP as diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapReadOnlyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapReadOnlyTest.java index c40b2b34b18..a5eef675080 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapReadOnlyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapReadOnlyTest.java @@ -1,15 +1,9 @@ package org.keycloak.testsuite.broker; -import static org.junit.Assert.assertEquals; -import static org.keycloak.models.utils.ModelToRepresentation.toRepresentationWithoutConfig; - import java.util.Map; import jakarta.ws.rs.core.Response; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; + import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.IdentityProviderSyncMode; @@ -29,6 +23,15 @@ import org.keycloak.testsuite.pages.IdpConfirmLinkPage; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; + +import static org.keycloak.models.utils.ModelToRepresentation.toRepresentationWithoutConfig; + +import static org.junit.Assert.assertEquals; + public final class KcOidcBrokerLdapReadOnlyTest extends AbstractInitializedBaseBrokerTest { @ClassRule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapTest.java index 94e87bdd140..c119b71a557 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLdapTest.java @@ -20,10 +20,7 @@ package org.keycloak.testsuite.broker; import java.util.Map; import jakarta.ws.rs.core.Response; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.LDAPConstants; import org.keycloak.models.utils.ModelToRepresentation; @@ -34,6 +31,11 @@ import org.keycloak.storage.ldap.LDAPStorageProviderFactory; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.LDAPRule; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; + public final class KcOidcBrokerLdapTest extends AbstractInitializedBaseBrokerTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLoginHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLoginHintTest.java index fc274628b7d..dee6117322f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLoginHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLoginHintTest.java @@ -3,15 +3,6 @@ package org.keycloak.testsuite.broker; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; -import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; -import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; - -import org.junit.Test; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.models.IdentityProviderModel; @@ -22,6 +13,17 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.updaters.Creator; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; +import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; +import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; + +import static org.junit.Assert.assertTrue; + public class KcOidcBrokerLoginHintTest extends AbstractBrokerTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutFrontChannelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutFrontChannelTest.java index f9dc4d6ffed..713b2a0408b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutFrontChannelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutFrontChannelTest.java @@ -1,7 +1,7 @@ package org.keycloak.testsuite.broker; -import org.junit.Rule; -import org.junit.Test; +import java.util.Map; + import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; import org.keycloak.models.IdentityProviderSyncMode; @@ -9,14 +9,16 @@ import org.keycloak.representations.IDToken; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.Map; +import org.junit.Rule; +import org.junit.Test; -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.junit.Assert.assertEquals; + public class KcOidcBrokerLogoutFrontChannelTest extends AbstractKcOidcBrokerLogoutTest { @Rule public AssertEvents events = new AssertEvents(this); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java index bd030f20c8f..24838de6b13 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerLogoutTest.java @@ -1,8 +1,8 @@ package org.keycloak.testsuite.broker; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.TokenVerifier; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.RealmResource; @@ -14,17 +14,19 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.AccountHelper; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.WaitUtils; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; -import java.util.HashMap; -import java.util.Map; +import static org.junit.Assert.assertEquals; public class KcOidcBrokerLogoutTest extends AbstractKcOidcBrokerLogoutTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNoLoginHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNoLoginHintTest.java index cf64ac3ae6e..9635054abc0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNoLoginHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNoLoginHintTest.java @@ -3,12 +3,6 @@ package org.keycloak.testsuite.broker; import java.util.List; import java.util.Map; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; -import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; -import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; -import org.apache.commons.lang3.StringUtils; import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.IdentityProviderSyncMode; @@ -16,6 +10,14 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; +import org.apache.commons.lang3.StringUtils; + +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; +import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; +import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + public class KcOidcBrokerNoLoginHintTest extends AbstractBrokerTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNonceParameterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNonceParameterTest.java index 4e7a449905f..0a2ec1f43cb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNonceParameterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerNonceParameterTest.java @@ -1,7 +1,10 @@ package org.keycloak.testsuite.broker; -import org.junit.Assert; -import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.broker.oidc.OIDCIdentityProvider; import org.keycloak.jose.jws.JWSInput; @@ -19,10 +22,8 @@ import org.keycloak.testsuite.util.broker.OIDCIdentityProviderConfigRep; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import org.junit.Assert; +import org.junit.Test; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerParameterForwardTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerParameterForwardTest.java index 4437b52bb09..de1abf5aa3a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerParameterForwardTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerParameterForwardTest.java @@ -1,13 +1,5 @@ package org.keycloak.testsuite.broker; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; -import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; - import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.List; @@ -21,6 +13,15 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; +import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; + public class KcOidcBrokerParameterForwardTest extends AbstractBrokerTest { private static final String FORWARDED_PARAMETER = "forwarded_parameter"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPassMaxAgeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPassMaxAgeTest.java index 9e9dc541e97..aee4c12d3c9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPassMaxAgeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPassMaxAgeTest.java @@ -1,7 +1,7 @@ package org.keycloak.testsuite.broker; -import org.junit.Ignore; -import org.junit.Test; +import java.util.Map; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.models.IdentityProviderModel; @@ -10,7 +10,8 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.broker.oidc.TestKeycloakOidcIdentityProviderFactory; -import java.util.Map; +import org.junit.Ignore; +import org.junit.Test; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtClientIdRequiredTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtClientIdRequiredTest.java index d9d83fb9cd5..f0b24eaa775 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtClientIdRequiredTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtClientIdRequiredTest.java @@ -16,7 +16,10 @@ */ package org.keycloak.testsuite.broker; -import org.junit.Before; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.AuthenticationFlow; import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; @@ -35,9 +38,7 @@ import org.keycloak.testsuite.util.ExecutionBuilder; import org.keycloak.testsuite.util.FlowBuilder; import org.keycloak.testsuite.util.KeyUtils; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.junit.Before; import static org.keycloak.testsuite.AbstractAuthenticationTest.findFlowByAlias; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomAudienceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomAudienceTest.java index 1e6b83d15df..970e25b5eae 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomAudienceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomAudienceTest.java @@ -16,6 +16,10 @@ */ package org.keycloak.testsuite.broker; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; import org.keycloak.crypto.Algorithm; import org.keycloak.models.IdentityProviderSyncMode; @@ -25,10 +29,6 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.KeysMetadataRepresentation.KeyMetadataRepresentation; import org.keycloak.testsuite.util.KeyUtils; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomSignAlgTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomSignAlgTest.java index 0ea634283fc..621c8f8175a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomSignAlgTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtCustomSignAlgTest.java @@ -1,5 +1,11 @@ package org.keycloak.testsuite.broker; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.Keycloak; import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; import org.keycloak.common.util.MultivaluedHashMap; @@ -14,12 +20,6 @@ import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.testsuite.util.TokenSignatureUtil; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import jakarta.ws.rs.core.Response; - import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtMissingUseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtMissingUseTest.java index d465f5550cd..a8f3e357fde 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtMissingUseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtMissingUseTest.java @@ -16,6 +16,10 @@ */ package org.keycloak.testsuite.broker; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.keys.KeyProvider; @@ -28,10 +32,6 @@ import org.keycloak.representations.idm.ComponentExportRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtTest.java index debae043a79..8842e4bd37d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtTest.java @@ -16,6 +16,10 @@ */ package org.keycloak.testsuite.broker; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; import org.keycloak.crypto.Algorithm; import org.keycloak.models.IdentityProviderSyncMode; @@ -25,10 +29,6 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.KeysMetadataRepresentation.KeyMetadataRepresentation; import org.keycloak.testsuite.util.KeyUtils; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtUnsupportedKeyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtUnsupportedKeyTest.java index 9609f47da0a..adb5bc5a25f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtUnsupportedKeyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtUnsupportedKeyTest.java @@ -16,6 +16,10 @@ */ package org.keycloak.testsuite.broker; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.keys.KeyProvider; @@ -28,10 +32,6 @@ import org.keycloak.representations.idm.ComponentExportRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtWithX509HeadersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtWithX509HeadersTest.java index 19cb9c07536..4c3b42f5001 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtWithX509HeadersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPrivateKeyJwtWithX509HeadersTest.java @@ -16,6 +16,10 @@ */ package org.keycloak.testsuite.broker; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; import org.keycloak.crypto.Algorithm; import org.keycloak.models.IdentityProviderSyncMode; @@ -25,10 +29,6 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.KeysMetadataRepresentation.KeyMetadataRepresentation; import org.keycloak.testsuite.util.KeyUtils; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptNoneRedirectTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptNoneRedirectTest.java index 60308607618..0bc07008426 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptNoneRedirectTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptNoneRedirectTest.java @@ -19,8 +19,6 @@ package org.keycloak.testsuite.broker; import java.util.List; import java.util.Map; -import org.junit.Ignore; -import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.representations.idm.ClientRepresentation; @@ -29,14 +27,18 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.UserBuilder; -import static org.junit.Assert.assertEquals; +import org.junit.Ignore; +import org.junit.Test; + import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.configurePostBrokerLoginWithOTP; import static org.keycloak.testsuite.broker.BrokerTestConstants.CLIENT_ID; import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + +import static org.junit.Assert.assertEquals; /** * This class tests the propagation of the {@code prompt=none} request parameter to a default IDP (if one has been specified) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptParameterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptParameterTest.java index 5b6defba171..591c7998f06 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptParameterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerPromptParameterTest.java @@ -1,14 +1,14 @@ package org.keycloak.testsuite.broker; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; -import java.util.List; -import java.util.Map; - import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; public class KcOidcBrokerPromptParameterTest extends AbstractBrokerTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerStateParameterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerStateParameterTest.java index c530ccd40eb..8a86738a94b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerStateParameterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerStateParameterTest.java @@ -18,10 +18,6 @@ package org.keycloak.testsuite.broker; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.common.util.UriUtils; @@ -30,9 +26,15 @@ import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginExpiredPage; -import static org.hamcrest.MatcherAssert.assertThat; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Rule; +import org.junit.Test; + import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.hamcrest.MatcherAssert.assertThat; + /** * Tests related to OIDC "state" parameter used in the OIDC AuthenticationResponse sent by the IDP to the SP endpoint * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerSubMatchIntrospectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerSubMatchIntrospectionTest.java index 163c13f797a..f324819fb1f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerSubMatchIntrospectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerSubMatchIntrospectionTest.java @@ -1,17 +1,18 @@ package org.keycloak.testsuite.broker; -import org.junit.Ignore; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.testsuite.util.ClientBuilder; -import java.util.ArrayList; -import java.util.List; +import org.junit.Ignore; +import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; import static org.keycloak.testsuite.util.ProtocolMapperUtil.createHardcodedClaim; -import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; public class KcOidcBrokerSubMatchIntrospectionTest extends AbstractBrokerTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java index 97b4944e0c8..fa83e96e44a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTest.java @@ -1,14 +1,15 @@ package org.keycloak.testsuite.broker; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.Response; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientScopeResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -52,13 +53,21 @@ import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.util.oauth.OAuthClient; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.hamcrest.Matchers; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; +import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; +import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createHardcodedClaim; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; @@ -67,12 +76,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; -import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; -import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createHardcodedClaim; /** * Final class as it's not intended to be overriden. Feel free to remove "final" if you really know what you are doing. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java index 547dcc9765d..3f21b824326 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTokenExchangeTest.java @@ -17,18 +17,9 @@ package org.keycloak.testsuite.broker; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.lessThanOrEqualTo; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createHardcodedClaim; - +import java.io.Closeable; import java.io.IOException; +import java.util.Map; import java.util.Set; import jakarta.ws.rs.client.Client; @@ -38,9 +29,7 @@ import jakarta.ws.rs.core.Form; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import java.io.Closeable; -import java.util.Map; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -75,11 +64,25 @@ import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.EnableFeatures; import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; import org.keycloak.testsuite.util.AdminClientUtil; +import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.broker.OIDCIdentityProviderConfigRep; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.util.BasicAuthHelper; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createHardcodedClaim; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.lessThanOrEqualTo; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; + /** * Test for identity-provider token exchange scenarios. Base for tests of token-exchange V1 */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTransientSessionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTransientSessionsTest.java index bbc476152b2..bdb0a8feadc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTransientSessionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerTransientSessionsTest.java @@ -1,15 +1,19 @@ package org.keycloak.testsuite.broker; -import org.jboss.arquillian.graphene.page.Page; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.admin.client.resource.IdentityProviderResource; @@ -59,25 +63,32 @@ import org.keycloak.testsuite.pages.UpdateAccountInformationPage; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.Creator; import org.keycloak.testsuite.util.AccountHelper; +import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.WaitUtils; - import org.keycloak.util.TokenUtil; -import com.fasterxml.jackson.databind.JsonNode; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; +import com.fasterxml.jackson.databind.JsonNode; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; +import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; +import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; +import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.keycloak.testsuite.broker.KcOidcBrokerConfiguration.CONSUMER_BROKER_APP_CLIENT_ID; +import static org.keycloak.testsuite.broker.KcOidcBrokerConfiguration.CONSUMER_BROKER_APP_SECRET; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createHardcodedClaim; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.aMapWithSize; import static org.hamcrest.Matchers.containsString; @@ -91,14 +102,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; -import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; -import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createHardcodedClaim; -import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; -import static org.keycloak.testsuite.broker.KcOidcBrokerConfiguration.CONSUMER_BROKER_APP_CLIENT_ID; -import static org.keycloak.testsuite.broker.KcOidcBrokerConfiguration.CONSUMER_BROKER_APP_SECRET; /** * Final class as it's not intended to be overriden. Feel free to remove "final" if you really know what you are doing. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesDisabledTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesDisabledTest.java index 55c455bfa1f..2863bdca507 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesDisabledTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesDisabledTest.java @@ -1,24 +1,26 @@ package org.keycloak.testsuite.broker; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; -import java.util.List; -import java.util.Map; - import static java.util.Locale.ENGLISH; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; + import static org.keycloak.OAuth2Constants.UI_LOCALES_PARAM; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; + public class KcOidcBrokerUiLocalesDisabledTest extends AbstractBrokerTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesEnabledTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesEnabledTest.java index ccb5129ed11..fcf8c67860f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesEnabledTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesEnabledTest.java @@ -1,23 +1,25 @@ package org.keycloak.testsuite.broker; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; -import java.util.List; -import java.util.Map; - import static java.util.Locale.ENGLISH; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; + import static org.keycloak.OAuth2Constants.UI_LOCALES_PARAM; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; + public class KcOidcBrokerUiLocalesEnabledTest extends AbstractBrokerTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesWithIdpHintTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesWithIdpHintTest.java index 32d6f9633a9..d1d0b243038 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesWithIdpHintTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerUiLocalesWithIdpHintTest.java @@ -1,23 +1,24 @@ package org.keycloak.testsuite.broker; +import java.util.List; +import java.util.Locale; +import java.util.Map; + import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; -import java.util.List; -import java.util.Locale; -import java.util.Map; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.OAuth2Constants.UI_LOCALES_PARAM; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; + public class KcOidcBrokerUiLocalesWithIdpHintTest extends AbstractBrokerTest { private static final Locale HUNGARIAN = Locale.forLanguageTag("hu"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerWithConsentTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerWithConsentTest.java index 68ae16791a4..c92e4709815 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerWithConsentTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcBrokerWithConsentTest.java @@ -1,19 +1,21 @@ package org.keycloak.testsuite.broker; -import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.removeBrokerExpiredSessions; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; - import java.util.List; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.removeBrokerExpiredSessions; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + +import static org.junit.Assert.assertEquals; + public class KcOidcBrokerWithConsentTest extends AbstractInitializedBaseBrokerTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginDetectExistingUserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginDetectExistingUserTest.java index 2b97bc14600..d4e961d149c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginDetectExistingUserTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginDetectExistingUserTest.java @@ -1,7 +1,5 @@ package org.keycloak.testsuite.broker; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.RealmResource; @@ -17,9 +15,12 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.ExecutionBuilder; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotNull; +import org.junit.Before; +import org.junit.Test; + import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class KcOidcFirstBrokerLoginDetectExistingUserTest extends AbstractInitializedBaseBrokerTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginNewAuthTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginNewAuthTest.java index 5516b673890..38bb9406b5e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginNewAuthTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginNewAuthTest.java @@ -1,8 +1,5 @@ package org.keycloak.testsuite.broker; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.models.UserModel; @@ -14,9 +11,14 @@ import org.keycloak.testsuite.pages.PasswordPage; import org.keycloak.testsuite.pages.SelectAuthenticatorPage; import org.keycloak.testsuite.util.UserBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; /** * Tests first-broker-login flow with new authenticators. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginTest.java index 7e53296a41b..49a1a2ae5d2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcFirstBrokerLoginTest.java @@ -1,8 +1,7 @@ package org.keycloak.testsuite.broker; -import org.apache.commons.lang3.StringUtils; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Test; +import java.util.List; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.FederatedIdentityModel; @@ -22,28 +21,22 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.broker.oidc.TestKeycloakOidcIdentityProviderFactory; import org.keycloak.testsuite.forms.RegisterWithUserProfileTest; import org.keycloak.testsuite.forms.VerifyProfileTest; +import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginUpdateProfilePage; import org.keycloak.testsuite.pages.RegisterPage; -import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.ClientScopeBuilder; import org.keycloak.testsuite.util.MailServerConfiguration; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.util.JsonSerialization; + +import org.apache.commons.lang3.StringUtils; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.WebElement; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.admin.ApiUtil.removeUserByUsername; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.grantReadTokenRole; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; @@ -55,7 +48,16 @@ import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.ATTRIBUTE_ import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_EDITABLE; import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ALL; -import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcMultipleTabsBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcMultipleTabsBrokerTest.java index 6488efce1bf..e00a657fb9f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcMultipleTabsBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcMultipleTabsBrokerTest.java @@ -19,10 +19,6 @@ package org.keycloak.testsuite.broker; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.broker.oidc.OAuth2IdentityProviderConfig; @@ -40,14 +36,20 @@ import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assume.assumeTrue; + import static org.keycloak.testsuite.AssertEvents.DEFAULT_REDIRECT_URI; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assume.assumeTrue; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcPostBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcPostBrokerLoginTest.java index 14109a84d8c..3a9f367e6f5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcPostBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcOidcPostBrokerLoginTest.java @@ -22,9 +22,6 @@ package org.keycloak.testsuite.broker; import java.util.HashMap; import java.util.Map; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.AuthenticationFlow; @@ -42,6 +39,11 @@ import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.FlowUtil; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import static org.keycloak.models.utils.TimeBasedOTP.DEFAULT_INTERVAL_SECONDS; import static org.keycloak.testsuite.admin.ApiUtil.removeUserByUsername; import static org.keycloak.testsuite.broker.BrokerRunOnServerUtil.configurePostBrokerLoginWithOTP; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAdvancedAttributeToGroupMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAdvancedAttributeToGroupMapperTest.java index c92675747bd..b3390e53271 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAdvancedAttributeToGroupMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAdvancedAttributeToGroupMapperTest.java @@ -1,8 +1,11 @@ package org.keycloak.testsuite.broker; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import org.junit.Test; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.CreatedResponseUtil; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.broker.provider.ConfigConstants; @@ -13,11 +16,9 @@ import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import jakarta.ws.rs.core.Response; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import org.junit.Test; import static org.keycloak.testsuite.broker.KcSamlBrokerConfiguration.ATTRIBUTE_TO_MAP_FRIENDLY_NAME; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAdvancedAttributeToRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAdvancedAttributeToRoleMapperTest.java index 99e2c2140c6..5bbcf878226 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAdvancedAttributeToRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAdvancedAttributeToRoleMapperTest.java @@ -1,8 +1,9 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.testsuite.broker.KcSamlBrokerConfiguration.ATTRIBUTE_TO_MAP_FRIENDLY_NAME; +import java.util.HashMap; +import java.util.List; +import java.util.Map; -import org.junit.Test; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.broker.saml.mappers.AdvancedAttributeToRoleMapper; import org.keycloak.models.IdentityProviderMapperModel; @@ -11,10 +12,9 @@ import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.junit.Test; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import static org.keycloak.testsuite.broker.KcSamlBrokerConfiguration.ATTRIBUTE_TO_MAP_FRIENDLY_NAME; /** * @author Martin Idel, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAttributeConsumingServiceIndexTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAttributeConsumingServiceIndexTest.java index fba4afb61d0..284ec665de8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAttributeConsumingServiceIndexTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlAttributeConsumingServiceIndexTest.java @@ -1,5 +1,7 @@ package org.keycloak.testsuite.broker; +import java.io.Closeable; + import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.saml.common.util.DocumentUtil; @@ -9,12 +11,12 @@ import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.io.Closeable; import org.junit.Assert; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; + import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerAllowedClockSkewTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerAllowedClockSkewTest.java index 7b89363c825..076a6f69a85 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerAllowedClockSkewTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerAllowedClockSkewTest.java @@ -17,11 +17,9 @@ package org.keycloak.testsuite.broker; import java.io.Closeable; -import jakarta.ws.rs.core.Response; -import org.hamcrest.Matchers; -import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; @@ -29,13 +27,18 @@ import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.testsuite.saml.AbstractSamlTest; import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; +import org.keycloak.testsuite.util.SamlClient; +import org.keycloak.testsuite.util.SamlClientBuilder; + +import org.hamcrest.Matchers; +import org.junit.Test; +import org.w3c.dom.Document; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.keycloak.testsuite.util.Matchers.isSamlResponse; import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; -import org.keycloak.testsuite.util.SamlClient; -import org.keycloak.testsuite.util.SamlClientBuilder; -import org.w3c.dom.Document; + +import static org.hamcrest.MatcherAssert.assertThat; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerArtifactBindingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerArtifactBindingTest.java index 7d4cca95c14..2e61ab68743 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerArtifactBindingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerArtifactBindingTest.java @@ -2,9 +2,7 @@ package org.keycloak.testsuite.broker; import java.io.Closeable; import java.io.IOException; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Test; + import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.crypto.Algorithm; import org.keycloak.protocol.saml.SamlConfigAttributes; @@ -13,6 +11,10 @@ import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; import org.keycloak.testsuite.util.KeyUtils; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Test; + public final class KcSamlBrokerArtifactBindingTest extends AbstractInitializedBaseBrokerTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerConfiguration.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerConfiguration.java index b9fb3e8a541..b11e7c75e96 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerConfiguration.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerConfiguration.java @@ -5,6 +5,13 @@ */ package org.keycloak.testsuite.broker; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.protocol.ProtocolMapperUtils; @@ -17,15 +24,8 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RealmRepresentation; - import org.keycloak.testsuite.saml.AbstractSamlTest; import org.keycloak.testsuite.util.ClientBuilder; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import static org.keycloak.broker.saml.SAMLIdentityProviderConfig.ARTIFACT_BINDING_RESPONSE; import static org.keycloak.broker.saml.SAMLIdentityProviderConfig.ARTIFACT_RESOLUTION_SERVICE_URL; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerDestinationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerDestinationTest.java index b52a05c5677..f3fb6b6bbed 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerDestinationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerDestinationTest.java @@ -2,8 +2,8 @@ package org.keycloak.testsuite.broker; import java.util.Collections; -import org.junit.Rule; -import org.junit.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.events.Errors; import org.keycloak.events.EventType; import org.keycloak.protocol.saml.SamlConfigAttributes; @@ -12,11 +12,11 @@ import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; + +import org.junit.Rule; +import org.junit.Test; import org.w3c.dom.Element; -import jakarta.ws.rs.core.Response; - -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_SAML_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; @@ -24,6 +24,8 @@ import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_LOGIN; import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_PASSWORD; import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; +import static org.hamcrest.MatcherAssert.assertThat; + public class KcSamlBrokerDestinationTest extends AbstractBrokerTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java index 232b60c9210..6964719866d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerFrontendUrlTest.java @@ -1,26 +1,5 @@ package org.keycloak.testsuite.broker; -import org.apache.http.conn.ssl.NoopHostnameVerifier; -import org.apache.http.conn.ssl.TrustAllStrategy; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.ssl.SSLContextBuilder; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; -import org.keycloak.dom.saml.v2.protocol.ResponseType; -import org.keycloak.events.Errors; -import org.keycloak.events.EventType; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.saml.common.constants.JBossSAMLURIConstants; -import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; -import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.util.Matchers; -import org.keycloak.testsuite.util.ReverseProxy; -import org.keycloak.testsuite.util.SamlClient; -import org.keycloak.testsuite.util.SamlClientBuilder; - -import jakarta.ws.rs.core.Response; import java.net.URI; import java.net.URISyntaxException; import java.net.URLEncoder; @@ -34,9 +13,29 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; +import jakarta.ws.rs.core.Response; + +import org.keycloak.dom.saml.v2.protocol.ResponseType; +import org.keycloak.events.Errors; +import org.keycloak.events.EventType; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.saml.common.constants.JBossSAMLURIConstants; +import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; +import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.util.Matchers; +import org.keycloak.testsuite.util.ReverseProxy; +import org.keycloak.testsuite.util.SamlClient; +import org.keycloak.testsuite.util.SamlClientBuilder; + +import org.apache.http.conn.ssl.NoopHostnameVerifier; +import org.apache.http.conn.ssl.TrustAllStrategy; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.ssl.SSLContextBuilder; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; + import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_SAML_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; @@ -45,6 +44,10 @@ import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_PASSWORD; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.startsWith; +import static org.hamcrest.MatcherAssert.assertThat; + public final class KcSamlBrokerFrontendUrlTest extends AbstractBrokerTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerLoginHintWithOptionEnabledTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerLoginHintWithOptionEnabledTest.java index 6490c487c60..116428da68f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerLoginHintWithOptionEnabledTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerLoginHintWithOptionEnabledTest.java @@ -1,11 +1,13 @@ package org.keycloak.testsuite.broker; -import org.junit.Test; import org.keycloak.testsuite.Assert; -import static org.junit.Assert.assertEquals; +import org.junit.Test; + import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; +import static org.junit.Assert.assertEquals; + public class KcSamlBrokerLoginHintWithOptionEnabledTest extends AbstractSamlLoginHintTest { // KEYCLOAK-13950 diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerSessionNotOnOrAfterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerSessionNotOnOrAfterTest.java index 92ac7d03edf..d0bbd015289 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerSessionNotOnOrAfterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerSessionNotOnOrAfterTest.java @@ -1,6 +1,7 @@ package org.keycloak.testsuite.broker; -import org.junit.Test; +import java.util.Set; + import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; import org.keycloak.dom.saml.v2.assertion.StatementAbstractType; import org.keycloak.dom.saml.v2.protocol.ResponseType; @@ -11,17 +12,18 @@ import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.util.Set; +import org.junit.Test; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_SAML_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_LOGIN; import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_PASSWORD; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; + public class KcSamlBrokerSessionNotOnOrAfterTest extends AbstractBrokerTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java index 88e6a967021..323988354b1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlBrokerTest.java @@ -1,9 +1,20 @@ package org.keycloak.testsuite.broker; +import java.io.Closeable; +import java.net.URI; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; -import com.google.common.collect.ImmutableMap; import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.broker.saml.mappers.AttributeToRoleMapper; import org.keycloak.broker.saml.mappers.UserAttributeMapper; @@ -34,17 +45,7 @@ import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.util.saml.ModifySamlResponseStepBuilder; -import java.io.Closeable; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.List; - +import com.google.common.collect.ImmutableMap; import org.apache.http.NameValuePair; import org.apache.http.client.methods.HttpUriRequest; import org.hamcrest.Matchers; @@ -52,19 +53,20 @@ import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.hamcrest.Matchers.hasItems; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.keycloak.testsuite.saml.RoleMapperTest.ROLE_ATTRIBUTE_NAME; +import static org.keycloak.testsuite.util.Matchers.bodyHC; import static org.keycloak.testsuite.util.Matchers.isSamlResponse; import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; import static org.keycloak.testsuite.util.SamlStreams.assertionsUnencrypted; import static org.keycloak.testsuite.util.SamlStreams.attributeStatements; import static org.keycloak.testsuite.util.SamlStreams.attributesUnecrypted; -import static org.keycloak.testsuite.util.Matchers.bodyHC; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_HOST2; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.not; + /** * Final class as it's not intended to be overriden. Feel free to remove "final" if you really know what you are doing. */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlCustomEntityIdBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlCustomEntityIdBrokerTest.java index 6a290b6fc66..116e3aecff1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlCustomEntityIdBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlCustomEntityIdBrokerTest.java @@ -1,5 +1,7 @@ package org.keycloak.testsuite.broker; +import java.io.Closeable; + import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.saml.common.util.DocumentUtil; @@ -9,12 +11,12 @@ import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.io.Closeable; import org.junit.Assert; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; + import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ASSERTION_NSURI; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlEncryptedAssertionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlEncryptedAssertionTest.java index ed646747500..531ff1b0d42 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlEncryptedAssertionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlEncryptedAssertionTest.java @@ -17,6 +17,11 @@ package org.keycloak.testsuite.broker; +import java.security.PublicKey; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import javax.xml.namespace.QName; + import org.keycloak.saml.RandomSecret; import org.keycloak.saml.common.constants.JBossSAMLConstants; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; @@ -24,17 +29,14 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.processing.core.util.XMLEncryptionUtil; import org.keycloak.testsuite.util.saml.SamlDocumentStepBuilder; + import org.w3c.dom.Node; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; -import javax.xml.namespace.QName; -import java.security.PublicKey; +import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ASSERTION_NSURI; +import static org.keycloak.testsuite.utils.io.IOUtil.setDocElementAttributeValue; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ASSERTION_NSURI; -import static org.keycloak.testsuite.utils.io.IOUtil.setDocElementAttributeValue; public class KcSamlEncryptedAssertionTest extends AbstractKcSamlEncryptedElementsTest { @@ -79,4 +81,3 @@ public class KcSamlEncryptedAssertionTest extends AbstractKcSamlEncryptedElement }; } } - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlEncryptedIdTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlEncryptedIdTest.java index d2c9185aa3f..b61b6d7d676 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlEncryptedIdTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlEncryptedIdTest.java @@ -1,24 +1,26 @@ package org.keycloak.testsuite.broker; -import org.hamcrest.CoreMatchers; +import java.security.PublicKey; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; +import javax.xml.namespace.QName; + import org.keycloak.saml.RandomSecret; import org.keycloak.saml.common.constants.JBossSAMLConstants; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.common.util.DocumentUtil; import org.keycloak.saml.processing.core.util.XMLEncryptionUtil; import org.keycloak.testsuite.util.saml.SamlDocumentStepBuilder; + +import org.hamcrest.CoreMatchers; import org.w3c.dom.Element; import org.w3c.dom.Node; -import javax.crypto.SecretKey; -import javax.crypto.spec.SecretKeySpec; -import javax.xml.namespace.QName; -import java.security.PublicKey; +import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ASSERTION_NSURI; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; -import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ASSERTION_NSURI; public class KcSamlEncryptedIdTest extends AbstractKcSamlEncryptedElementsTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlForceAuthnBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlForceAuthnBrokerTest.java index 9d1e10470a6..58209cc9b66 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlForceAuthnBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlForceAuthnBrokerTest.java @@ -18,6 +18,8 @@ */ package org.keycloak.testsuite.broker; +import java.io.Closeable; + import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; @@ -26,11 +28,11 @@ import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.io.Closeable; import org.junit.Assert; import org.junit.Test; import org.w3c.dom.Document; + import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java index 9074570a5e2..4cd0ed191ca 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlIdPInitiatedSsoTest.java @@ -1,5 +1,20 @@ package org.keycloak.testsuite.broker; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.UsersResource; @@ -29,24 +44,11 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.PageUtils; import org.keycloak.testsuite.pages.UpdateAccountInformationPage; -import org.keycloak.testsuite.utils.io.IOUtil; - import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; -import java.util.stream.Collectors; -import jakarta.ws.rs.core.Response; +import org.keycloak.testsuite.utils.io.IOUtil; + import org.jboss.arquillian.graphene.page.Page; import org.junit.Before; import org.junit.Test; @@ -55,6 +57,10 @@ import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.ExpectedCondition; import org.openqa.selenium.support.ui.WebDriverWait; +import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; +import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; @@ -63,10 +69,7 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; -import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlLogoutTest.java index 1800c110e77..26fde46af8f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlLogoutTest.java @@ -1,7 +1,9 @@ package org.keycloak.testsuite.broker; -import org.hamcrest.Matchers; -import org.junit.Test; +import java.io.Closeable; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; + import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; @@ -23,15 +25,11 @@ import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.util.saml.SamlMessageReceiver; + +import org.hamcrest.Matchers; +import org.junit.Test; import org.w3c.dom.Document; -import java.io.Closeable; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; - -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_SAML_ALIAS; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; @@ -42,6 +40,10 @@ import static org.keycloak.testsuite.util.Matchers.isSamlResponse; import static org.keycloak.testsuite.util.Matchers.isSamlStatusResponse; import static org.keycloak.testsuite.util.SamlClient.Binding.POST; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + public class KcSamlLogoutTest extends AbstractInitializedBaseBrokerTest { private static final String PROVIDER_SAML_CLIENT_ID = getProviderRoot() + "/sales-post/"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMetadataSignedAndEncryptedBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMetadataSignedAndEncryptedBrokerTest.java index d52caefcd44..584a80fceb9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMetadataSignedAndEncryptedBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMetadataSignedAndEncryptedBrokerTest.java @@ -16,17 +16,14 @@ */ package org.keycloak.testsuite.broker; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; import java.io.Closeable; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.crypto.Algorithm; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; @@ -48,6 +45,12 @@ import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; import org.keycloak.testsuite.util.KeyUtils; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.w3c.dom.Document; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMetadataSignedBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMetadataSignedBrokerTest.java index 69e1b0d29f1..167f3b46c4c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMetadataSignedBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMetadataSignedBrokerTest.java @@ -16,15 +16,13 @@ */ package org.keycloak.testsuite.broker; -import jakarta.ws.rs.core.Response.Status; import java.io.Closeable; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Test; + +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.crypto.Algorithm; import org.keycloak.models.IdentityProviderSyncMode; @@ -37,6 +35,11 @@ import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.KeyUtils; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Test; + /** * * @author rmartinc diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMultipleTabsBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMultipleTabsBrokerTest.java index cc149fae47e..c89a304b263 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMultipleTabsBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlMultipleTabsBrokerTest.java @@ -19,10 +19,6 @@ package org.keycloak.testsuite.broker; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventType; @@ -33,10 +29,16 @@ import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.htmlunit.HtmlUnitDriver; + +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assume.assumeTrue; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlParseIdPDescriptorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlParseIdPDescriptorTest.java index f892a6e1de5..b16423daaee 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlParseIdPDescriptorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlParseIdPDescriptorTest.java @@ -16,10 +16,18 @@ */ package org.keycloak.testsuite.broker; -import jakarta.ws.rs.core.MediaType; import java.io.IOException; import java.util.List; import java.util.Map; + +import jakarta.ws.rs.core.MediaType; + +import org.keycloak.broker.saml.SAMLIdentityProviderConfig; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.saml.common.constants.JBossSAMLURIConstants; +import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.util.RealmBuilder; + import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; @@ -28,11 +36,6 @@ import org.apache.http.util.EntityUtils; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput; import org.junit.Assert; import org.junit.Test; -import org.keycloak.broker.saml.SAMLIdentityProviderConfig; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.saml.common.constants.JBossSAMLURIConstants; -import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.util.RealmBuilder; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlRequestedAuthnContextBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlRequestedAuthnContextBrokerTest.java index 0973d3715b4..37305252edb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlRequestedAuthnContextBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlRequestedAuthnContextBrokerTest.java @@ -1,5 +1,7 @@ package org.keycloak.testsuite.broker; +import java.io.Closeable; + import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.dom.saml.v2.protocol.AuthnContextComparisonType; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; @@ -10,18 +12,19 @@ import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.io.Closeable; import org.hamcrest.Matchers; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import static org.hamcrest.MatcherAssert.assertThat; + import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.AC_PASSWORD_PROTECTED_TRANSPORT; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.ASSERTION_NSURI; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.PROTOCOL_NSURI; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; +import static org.hamcrest.MatcherAssert.assertThat; + /** * Final class as it's not intended to be overriden. */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedBrokerTest.java index 5b9a3acef26..e9487402f1a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedBrokerTest.java @@ -1,5 +1,20 @@ package org.keycloak.testsuite.broker; +import java.io.Closeable; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; +import javax.xml.crypto.dsig.XMLSignature; +import javax.xml.namespace.QName; + +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.crypto.Algorithm; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; @@ -15,31 +30,17 @@ import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.saml.processing.core.parsers.saml.assertion.SAMLAssertionQNames; import org.keycloak.saml.processing.core.parsers.saml.protocol.SAMLProtocolQNames; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; - import org.keycloak.testsuite.saml.AbstractSamlTest; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.KeyUtils; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.saml.SamlDocumentStepBuilder.Saml2DocumentTransformer; -import java.io.Closeable; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; -import jakarta.ws.rs.core.Response.Status; -import javax.xml.crypto.dsig.XMLSignature; -import javax.xml.namespace.QName; import org.apache.http.HttpResponse; import org.hamcrest.Matcher; import org.hamcrest.Matchers; @@ -51,13 +52,14 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; +import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; import static org.keycloak.testsuite.util.Matchers.bodyHC; import static org.keycloak.testsuite.util.Matchers.isSamlResponse; -import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; public class KcSamlSignedBrokerTest extends AbstractBrokerTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedDocumentOnlyBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedDocumentOnlyBrokerTest.java index d07bc85e222..771a9aeb0af 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedDocumentOnlyBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSignedDocumentOnlyBrokerTest.java @@ -1,14 +1,14 @@ package org.keycloak.testsuite.broker; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.models.IdentityProviderSyncMode; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_SAML_SIGN_CERT; import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_SAML_SIGN_KEY; import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PRIVATE_KEY; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSpDescriptorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSpDescriptorTest.java index a72270be110..f4e59c77f83 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSpDescriptorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlSpDescriptorTest.java @@ -1,10 +1,17 @@ package org.keycloak.testsuite.broker; -import com.google.common.collect.ImmutableMap; +import java.io.Closeable; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.xml.crypto.dsig.XMLSignature; -import org.apache.tools.ant.filters.StringInputStream; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.broker.saml.mappers.AttributeToRoleMapper; @@ -21,33 +28,26 @@ import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderMapperSyncMode; import org.keycloak.protocol.saml.SAMLEncryptionAlgorithms; import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; -import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.representations.idm.KeysMetadataRepresentation; +import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.processing.core.parsers.saml.SAMLParser; import org.keycloak.testsuite.updaters.IdentityProviderAttributeUpdater; -import java.io.Closeable; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import com.google.common.collect.ImmutableMap; +import org.apache.tools.ant.filters.StringInputStream; +import org.junit.Assert; +import org.junit.Test; -import javax.xml.crypto.dsig.XMLSignature; +import static org.keycloak.testsuite.util.KeyUtils.generateNewRealmKey; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.util.KeyUtils.generateNewRealmKey; public class KcSamlSpDescriptorTest extends AbstractBrokerTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlUsernameTemplateMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlUsernameTemplateMapperTest.java index d81cc68dc2f..c803538d32e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlUsernameTemplateMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlUsernameTemplateMapperTest.java @@ -1,7 +1,5 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.broker.saml.mappers.UsernameTemplateMapper.PROVIDER_ID; - import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderMapperSyncMode; @@ -10,6 +8,8 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import com.google.common.collect.ImmutableMap; +import static org.keycloak.broker.saml.mappers.UsernameTemplateMapper.PROVIDER_ID; + /** * @author Martin Idel */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlXPathAttributeMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlXPathAttributeMapperTest.java index bb94eaeb41c..6f72a80e954 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlXPathAttributeMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/KcSamlXPathAttributeMapperTest.java @@ -1,7 +1,7 @@ package org.keycloak.testsuite.broker; -import com.google.common.collect.ImmutableMap; -import org.junit.Test; +import java.util.Collections; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.broker.saml.mappers.XPathAttributeMapper; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; @@ -17,14 +17,16 @@ import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.testsuite.saml.AbstractSamlTest; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; + +import com.google.common.collect.ImmutableMap; +import org.junit.Test; import org.w3c.dom.Document; -import java.util.Collections; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_SAML_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_SAML_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; /** * Integration test for the {@link XPathAttributeMapper}. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OAuth2BrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OAuth2BrokerTest.java index 4c798c0a8d6..8fddb39cb02 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OAuth2BrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OAuth2BrokerTest.java @@ -1,8 +1,10 @@ package org.keycloak.testsuite.broker; +import java.util.ArrayList; +import java.util.List; + import jakarta.ws.rs.BadRequestException; -import org.junit.Ignore; -import org.junit.Test; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.broker.oauth.OAuth2IdentityProviderFactory; import org.keycloak.models.IdentityProviderMapperSyncMode; @@ -17,8 +19,8 @@ import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; -import java.util.ArrayList; -import java.util.List; +import org.junit.Ignore; +import org.junit.Test; /** * Final class as it's not intended to be overriden. Feel free to remove "final" if you really know what you are doing. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAccessTokenOnlyClaimsUserAttributeMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAccessTokenOnlyClaimsUserAttributeMapperTest.java index 02111ee62ef..503879b411f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAccessTokenOnlyClaimsUserAttributeMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAccessTokenOnlyClaimsUserAttributeMapperTest.java @@ -1,9 +1,8 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; - import java.util.List; import java.util.Map; + import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.broker.oidc.OIDCIdentityProviderFactory; import org.keycloak.models.IdentityProviderSyncMode; @@ -12,6 +11,8 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; +import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; + public class OidcAccessTokenOnlyClaimsUserAttributeMapperTest extends OidcUserAttributeMapperTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToGroupMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToGroupMapperTest.java index 68c38906cb8..36579009370 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToGroupMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToGroupMapperTest.java @@ -1,13 +1,11 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; -import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; - import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.CreatedResponseUtil; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.broker.oidc.mappers.AdvancedClaimToGroupMapper; @@ -21,8 +19,10 @@ import org.keycloak.representations.idm.UserRepresentation; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.junit.Test; -import jakarta.ws.rs.core.Response; +import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; +import static org.keycloak.models.IdentityProviderMapperSyncMode.IMPORT; /** * @author Artur Baltabayev, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToRoleMapperTest.java index 2f2e837f191..dd0e4c84e80 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcAdvancedClaimToRoleMapperTest.java @@ -1,14 +1,14 @@ package org.keycloak.testsuite.broker; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.broker.oidc.mappers.AdvancedClaimToRoleMapper; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderMapperSyncMode; import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; -import java.util.HashMap; -import java.util.Map; - /** * Benjamin Weimer, * Martin Idel, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcBackchannelLogoutBrokerConfiguration.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcBackchannelLogoutBrokerConfiguration.java index cafc062bf5f..147e90c4537 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcBackchannelLogoutBrokerConfiguration.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcBackchannelLogoutBrokerConfiguration.java @@ -1,16 +1,9 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.testsuite.broker.BrokerTestConstants.CLIENT_ID; -import static org.keycloak.testsuite.broker.BrokerTestConstants.CLIENT_SECRET; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; -import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; -import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; -import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; -import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_LOGIN; -import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_PASSWORD; -import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; -import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; import org.keycloak.broker.oidc.OIDCIdentityProviderConfig; import org.keycloak.models.IdentityProviderModel; @@ -28,10 +21,17 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import static org.keycloak.testsuite.broker.BrokerTestConstants.CLIENT_ID; +import static org.keycloak.testsuite.broker.BrokerTestConstants.CLIENT_SECRET; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_PROVIDER_ID; +import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; +import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_PROV_NAME; +import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_EMAIL; +import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_LOGIN; +import static org.keycloak.testsuite.broker.BrokerTestConstants.USER_PASSWORD; +import static org.keycloak.testsuite.broker.BrokerTestTools.createIdentityProvider; +import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; public class OidcBackchannelLogoutBrokerConfiguration implements NestedBrokerConfiguration { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcClaimToRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcClaimToRoleMapperTest.java index 3881bdd5d71..5ffe7bb261d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcClaimToRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcClaimToRoleMapperTest.java @@ -1,9 +1,8 @@ package org.keycloak.testsuite.broker; -import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; -import static org.keycloak.models.IdentityProviderMapperSyncMode.LEGACY; +import java.util.List; +import java.util.Map; -import org.junit.Test; import org.keycloak.broker.oidc.mappers.ClaimToRoleMapper; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.models.IdentityProviderMapperModel; @@ -13,9 +12,10 @@ import org.keycloak.representations.idm.UserRepresentation; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.junit.Test; -import java.util.List; -import java.util.Map; +import static org.keycloak.models.IdentityProviderMapperSyncMode.FORCE; +import static org.keycloak.models.IdentityProviderMapperSyncMode.LEGACY; /** * @author Martin Idel, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcClaimToUserSessionNoteMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcClaimToUserSessionNoteMapperTest.java index fcf1ca86942..ac9807f8144 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcClaimToUserSessionNoteMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcClaimToUserSessionNoteMapperTest.java @@ -1,11 +1,9 @@ package org.keycloak.testsuite.broker; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.CreatedResponseUtil; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.ProtocolMappersResource; @@ -28,10 +26,12 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import com.google.common.collect.ImmutableMap; +import org.junit.Before; +import org.junit.Test; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; public class OidcClaimToUserSessionNoteMapperTest extends AbstractIdentityProviderMapperTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcHardcodedGroupMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcHardcodedGroupMapperTest.java index dc8951faf7f..e22cc06b629 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcHardcodedGroupMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcHardcodedGroupMapperTest.java @@ -1,5 +1,7 @@ package org.keycloak.testsuite.broker; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.CreatedResponseUtil; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.broker.provider.ConfigConstants; @@ -11,8 +13,6 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import com.google.common.collect.ImmutableMap; -import jakarta.ws.rs.core.Response; - /** * @author DanieleMartinoli * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcUserInfoClaimToRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcUserInfoClaimToRoleMapperTest.java index 8dc4feb8753..940f1be48eb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcUserInfoClaimToRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/OidcUserInfoClaimToRoleMapperTest.java @@ -1,6 +1,9 @@ package org.keycloak.testsuite.broker; -import org.junit.Test; +import java.util.Collections; +import java.util.List; +import java.util.Map; + import org.keycloak.broker.oidc.mappers.ClaimToRoleMapper; import org.keycloak.broker.provider.ConfigConstants; import org.keycloak.models.IdentityProviderMapperModel; @@ -18,10 +21,7 @@ import org.keycloak.representations.idm.UserRepresentation; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; - -import java.util.Collections; -import java.util.List; -import java.util.Map; +import org.junit.Test; /** * @author Dashaylan Naidoo, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java index 0c8ff83dba6..6d94bd6593d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/SocialLoginTest.java @@ -1,14 +1,16 @@ package org.keycloak.testsuite.broker; -import org.jboss.arquillian.graphene.Graphene; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.keycloak.models.IdentityProviderQuery; +import java.io.FileInputStream; +import java.util.List; +import java.util.Properties; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.authorization.model.Policy; @@ -18,6 +20,7 @@ import org.keycloak.common.Profile; import org.keycloak.models.ClientModel; import org.keycloak.models.IdentityProviderMapperModel; import org.keycloak.models.IdentityProviderMapperSyncMode; +import org.keycloak.models.IdentityProviderQuery; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.protocol.oidc.OIDCLoginProtocol; @@ -49,32 +52,27 @@ import org.keycloak.testsuite.pages.social.OpenShiftLoginPage; import org.keycloak.testsuite.pages.social.PayPalLoginPage; import org.keycloak.testsuite.pages.social.StackOverflowLoginPage; import org.keycloak.testsuite.pages.social.TwitterConsentLoginPage; +import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.DroneUtils; import org.keycloak.testsuite.util.IdentityProviderBuilder; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.URLUtils; import org.keycloak.testsuite.util.WaitUtils; +import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.util.BasicAuthHelper; + +import com.google.common.collect.ImmutableMap; +import org.jboss.arquillian.graphene.Graphene; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.Form; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import java.io.FileInputStream; -import java.util.List; -import java.util.Properties; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assume.assumeTrue; - -import org.keycloak.testsuite.util.AdminClientUtil; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.BITBUCKET; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.FACEBOOK; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.FACEBOOK_INCLUDE_BIRTHDAY; @@ -94,7 +92,10 @@ import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.PAYPAL; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.STACKOVERFLOW; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.TWITTER; -import com.google.common.collect.ImmutableMap; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assume.assumeTrue; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/UsernameTemplateMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/UsernameTemplateMapperTest.java index 17a3a344153..c33efc120d3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/UsernameTemplateMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/broker/UsernameTemplateMapperTest.java @@ -1,9 +1,5 @@ package org.keycloak.testsuite.broker; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.broker.oidc.mappers.UserAttributeMapper; @@ -12,9 +8,15 @@ import org.keycloak.representations.idm.IdentityProviderMapperRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import static org.junit.Assert.assertEquals; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import org.junit.Before; +import org.junit.Test; + import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; +import static org.junit.Assert.assertEquals; + public class UsernameTemplateMapperTest extends AbstractBaseBrokerTest { private String idpUserId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/AbstractCliTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/AbstractCliTest.java index d021648d9e1..941d310e0c4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/AbstractCliTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/AbstractCliTest.java @@ -1,13 +1,14 @@ package org.keycloak.testsuite.cli; -import org.junit.Assert; +import java.util.List; + import org.keycloak.common.crypto.FipsMode; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.AuthServerTestEnricher; import org.keycloak.testsuite.cli.exec.AbstractExec; -import java.util.List; +import org.junit.Assert; /** * @author Marko Strukelj diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/AbstractAdmCliTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/AbstractAdmCliTest.java index b9f44a4261d..17567369d0b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/AbstractAdmCliTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/AbstractAdmCliTest.java @@ -1,6 +1,18 @@ package org.keycloak.testsuite.cli.admin; -import org.junit.Assert; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.charset.Charset; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; import org.keycloak.client.cli.config.ConfigData; @@ -15,18 +27,7 @@ import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.charset.Charset; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import org.junit.Assert; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.cli.KcAdmExec.WORK_DIR; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmCreateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmCreateTest.java index c758ca8dda7..0fa713d21a8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmCreateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmCreateTest.java @@ -1,7 +1,9 @@ package org.keycloak.testsuite.cli.admin; -import org.junit.Assert; -import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.Arrays; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.client.cli.config.FileConfigHandler; import org.keycloak.models.IdentityProviderModel; @@ -10,9 +12,8 @@ import org.keycloak.testsuite.cli.KcAdmExec; import org.keycloak.testsuite.util.TempFileResource; import org.keycloak.util.JsonSerialization; -import java.io.File; -import java.io.IOException; -import java.util.Arrays; +import org.junit.Assert; +import org.junit.Test; import static org.keycloak.testsuite.cli.KcAdmExec.execute; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmSessionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmSessionTest.java index f6dcc2e593d..94ba0b6500b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmSessionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmSessionTest.java @@ -1,26 +1,27 @@ package org.keycloak.testsuite.cli.admin; -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.client.cli.config.FileConfigHandler; -import org.keycloak.testsuite.cli.KcAdmExec; -import org.keycloak.testsuite.util.TempFileResource; - import java.io.IOException; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import org.keycloak.client.cli.config.FileConfigHandler; +import org.keycloak.testsuite.cli.KcAdmExec; +import org.keycloak.testsuite.util.TempFileResource; + import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.cli.KcAdmExec.execute; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.cli.KcAdmExec.execute; /** * @author Marko Strukelj diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTest.java index bc794364a72..da9f7b75215 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTest.java @@ -1,7 +1,11 @@ package org.keycloak.testsuite.cli.admin; -import org.junit.Assert; -import org.junit.Test; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.List; +import java.util.UUID; + import org.keycloak.client.cli.config.ConfigData; import org.keycloak.client.cli.config.FileConfigHandler; import org.keycloak.client.cli.config.RealmConfigData; @@ -12,11 +16,8 @@ import org.keycloak.testsuite.util.KeystoreUtils; import org.keycloak.testsuite.util.TempFileResource; import org.keycloak.util.JsonSerialization; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.List; -import java.util.UUID; +import org.junit.Assert; +import org.junit.Test; import static org.keycloak.client.admin.cli.KcAdmMain.CMD; import static org.keycloak.client.cli.util.OsUtil.EOL; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTruststoreTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTruststoreTest.java index 572c778f27c..80d34973688 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTruststoreTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmTruststoreTest.java @@ -1,21 +1,22 @@ package org.keycloak.testsuite.cli.admin; -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.client.admin.cli.KcAdmMain; -import org.keycloak.client.cli.config.ConfigData; -import org.keycloak.client.cli.config.FileConfigHandler; -import org.keycloak.testsuite.cli.KcAdmExec; -import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.TempFileResource; - import java.io.File; import java.io.IOException; +import org.keycloak.client.admin.cli.KcAdmMain; +import org.keycloak.client.cli.config.ConfigData; +import org.keycloak.client.cli.config.FileConfigHandler; +import org.keycloak.testsuite.cli.KcAdmExec; +import org.keycloak.testsuite.util.TempFileResource; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.junit.Assert; +import org.junit.Test; + import static org.keycloak.client.admin.cli.KcAdmMain.DEFAULT_CONFIG_FILE_PATH; import static org.keycloak.client.cli.util.OsUtil.EOL; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; import static org.keycloak.testsuite.cli.KcAdmExec.execute; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; /** * @author Marko Strukelj diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmUpdateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmUpdateTest.java index 0dc59fd09cd..deca9bcde2d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmUpdateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/admin/KcAdmUpdateTest.java @@ -1,30 +1,32 @@ package org.keycloak.testsuite.cli.admin; -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.testsuite.cli.KcAdmExec; -import org.keycloak.testsuite.util.TempFileResource; -import org.keycloak.util.JsonSerialization; - import java.io.ByteArrayInputStream; import java.io.Closeable; import java.io.File; import java.io.IOException; import java.util.Arrays; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.broker.saml.SAMLIdentityProviderFactory; import org.keycloak.client.cli.config.FileConfigHandler; +import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.IdentityProviderRepresentation; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.cli.KcAdmExec.CMD; -import static org.keycloak.testsuite.cli.KcAdmExec.execute; +import org.keycloak.testsuite.cli.KcAdmExec; import org.keycloak.testsuite.updaters.IdentityProviderCreator; import org.keycloak.testsuite.util.IdentityProviderBuilder; +import org.keycloak.testsuite.util.TempFileResource; +import org.keycloak.util.JsonSerialization; + +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.cli.KcAdmExec.CMD; +import static org.keycloak.testsuite.cli.KcAdmExec.execute; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; /** * @author Marko Strukelj diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/AbstractRegCliTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/AbstractRegCliTest.java index de5efaec71b..23178ef083f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/AbstractRegCliTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/AbstractRegCliTest.java @@ -1,7 +1,18 @@ package org.keycloak.testsuite.cli.registration; -import org.junit.Assert; -import org.junit.Before; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.charset.Charset; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import org.keycloak.admin.client.resource.ClientInitialAccessResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; @@ -25,18 +36,8 @@ import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.charset.Charset; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import org.junit.Assert; +import org.junit.Before; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.cli.KcRegExec.WORK_DIR; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegConfigTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegConfigTest.java index 476dc50fd9d..31b6678648d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegConfigTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegConfigTest.java @@ -1,12 +1,13 @@ package org.keycloak.testsuite.cli.registration; -import org.junit.Assert; -import org.junit.Test; +import java.io.IOException; + import org.keycloak.client.cli.config.FileConfigHandler; import org.keycloak.testsuite.cli.KcRegExec; import org.keycloak.testsuite.util.TempFileResource; -import java.io.IOException; +import org.junit.Assert; +import org.junit.Test; import static org.keycloak.client.cli.util.OsUtil.EOL; import static org.keycloak.client.registration.cli.KcRegMain.CMD; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegCreateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegCreateTest.java index 52b88ff41c2..49c1f37f0e7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegCreateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegCreateTest.java @@ -1,10 +1,10 @@ package org.keycloak.testsuite.cli.registration; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Before; -import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -26,14 +26,16 @@ import org.keycloak.testsuite.cli.KcRegExec; import org.keycloak.testsuite.util.TempFileResource; import org.keycloak.util.JsonSerialization; -import java.io.File; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.cli.KcRegExec.execute; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; -import static org.keycloak.testsuite.cli.KcRegExec.execute; /** * @author Marko Strukelj diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTest.java index 0f5752a76ad..24d51dc6a45 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTest.java @@ -1,8 +1,11 @@ package org.keycloak.testsuite.cli.registration; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Test; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.List; +import java.util.UUID; + import org.keycloak.client.cli.config.ConfigData; import org.keycloak.client.cli.config.FileConfigHandler; import org.keycloak.client.cli.config.RealmConfigData; @@ -13,16 +16,14 @@ import org.keycloak.testsuite.util.KeystoreUtils; import org.keycloak.testsuite.util.TempFileResource; import org.keycloak.util.JsonSerialization; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.List; -import java.util.UUID; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Test; import static org.keycloak.client.cli.util.OsUtil.EOL; import static org.keycloak.client.registration.cli.KcRegMain.CMD; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; import static org.keycloak.testsuite.cli.KcRegExec.execute; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; /** * @author Marko Strukelj diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTruststoreTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTruststoreTest.java index d74de7333fd..697345cd37b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTruststoreTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegTruststoreTest.java @@ -1,21 +1,22 @@ package org.keycloak.testsuite.cli.registration; -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.client.cli.config.ConfigData; -import org.keycloak.client.cli.config.FileConfigHandler; -import org.keycloak.testsuite.cli.KcRegExec; -import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.TempFileResource; - import java.io.File; import java.io.IOException; -import static org.keycloak.client.registration.cli.KcRegMain.DEFAULT_CONFIG_FILE_PATH; +import org.keycloak.client.cli.config.ConfigData; +import org.keycloak.client.cli.config.FileConfigHandler; +import org.keycloak.testsuite.cli.KcRegExec; +import org.keycloak.testsuite.util.TempFileResource; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.junit.Assert; +import org.junit.Test; + import static org.keycloak.client.cli.util.OsUtil.EOL; import static org.keycloak.client.registration.cli.KcRegMain.CMD; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; +import static org.keycloak.client.registration.cli.KcRegMain.DEFAULT_CONFIG_FILE_PATH; import static org.keycloak.testsuite.cli.KcRegExec.execute; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; /** * @author Marko Strukelj diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTest.java index 5b5810b265d..4262d11864f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTest.java @@ -1,16 +1,17 @@ package org.keycloak.testsuite.cli.registration; -import org.junit.Assert; -import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.Arrays; + import org.keycloak.client.cli.config.FileConfigHandler; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testsuite.cli.KcRegExec; import org.keycloak.testsuite.util.TempFileResource; import org.keycloak.util.JsonSerialization; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.util.Arrays; +import org.junit.Assert; +import org.junit.Test; import static org.keycloak.client.registration.cli.KcRegMain.CMD; import static org.keycloak.testsuite.cli.KcRegExec.execute; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTokenTest.java index 9796c556589..26159253efa 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cli/registration/KcRegUpdateTokenTest.java @@ -1,7 +1,7 @@ package org.keycloak.testsuite.cli.registration; -import org.junit.Assert; -import org.junit.Test; +import java.io.IOException; + import org.keycloak.client.cli.config.ConfigData; import org.keycloak.client.cli.config.FileConfigHandler; import org.keycloak.client.cli.config.RealmConfigData; @@ -11,7 +11,8 @@ import org.keycloak.testsuite.cli.KcRegExec; import org.keycloak.testsuite.util.TempFileResource; import org.keycloak.util.JsonSerialization; -import java.io.IOException; +import org.junit.Assert; +import org.junit.Test; import static org.keycloak.testsuite.cli.KcRegExec.execute; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientRegistrationTest.java index 5c7e4ef4ade..9fd4258844e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractClientRegistrationTest.java @@ -16,8 +16,12 @@ */ package org.keycloak.testsuite.client; -import org.junit.After; -import org.junit.Before; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + +import jakarta.ws.rs.NotFoundException; + import org.keycloak.client.registration.Auth; import org.keycloak.client.registration.ClientRegistration; import org.keycloak.client.registration.ClientRegistrationException; @@ -29,10 +33,8 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import jakarta.ws.rs.NotFoundException; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; +import org.junit.After; +import org.junit.Before; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPI2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPI2Test.java index 798beea555a..8a3342ceb7c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPI2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPI2Test.java @@ -17,6 +17,8 @@ */ package org.keycloak.testsuite.client; +import java.util.Collections; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; @@ -34,13 +36,12 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.condition.AnyClientConditionFactory; import org.keycloak.testsuite.util.ClientPoliciesUtil; -import java.util.Collections; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; /** * Test for the FAPI 2 specifications (still implementer's draft): diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPITest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPITest.java index 9a1cf39d776..5efd7aabcfa 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPITest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AbstractFAPITest.java @@ -17,9 +17,6 @@ */ package org.keycloak.testsuite.client; -import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; - import java.nio.charset.StandardCharsets; import java.security.KeyPair; import java.security.PrivateKey; @@ -32,18 +29,6 @@ import java.util.List; import java.util.Map; import java.util.function.Supplier; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Assume; -import org.junit.BeforeClass; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.util.KeyUtils; @@ -65,12 +50,29 @@ import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.OAuthGrantPage; +import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.SignatureSignerUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.PkceGenerator; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Assume; +import org.junit.BeforeClass; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; + +import static org.junit.Assert.assertEquals; + public abstract class AbstractFAPITest extends AbstractClientPoliciesTest { protected final String TEST_USERNAME = "john"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AdapterInstallationConfigTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AdapterInstallationConfigTest.java index e13c80c377c..29c22f4a996 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AdapterInstallationConfigTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/AdapterInstallationConfigTest.java @@ -16,8 +16,6 @@ */ package org.keycloak.testsuite.client; -import org.junit.Before; -import org.junit.Test; import org.keycloak.client.registration.Auth; import org.keycloak.client.registration.ClientRegistrationException; import org.keycloak.client.registration.HttpErrorException; @@ -25,10 +23,14 @@ import org.keycloak.common.enums.SslRequired; import org.keycloak.representations.adapters.config.AdapterConfig; import org.keycloak.representations.idm.ClientRepresentation; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java index a97a18762f0..a7b9a35dc32 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/CIBATest.java @@ -16,34 +16,6 @@ */ package org.keycloak.testsuite.client; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.emptyOrNullString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.containsString; - -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.core.Response.Status; - -import org.apache.http.impl.client.CloseableHttpClient; - -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.CANCELLED; -import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.SUCCEED; -import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.UNAUTHORIZED; -import static org.keycloak.testsuite.Assert.assertExpiration; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureCibaAuthenticationRequestSigningAlgorithmExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; - import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -55,12 +27,9 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.hamcrest.CoreMatchers; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -104,27 +73,58 @@ import org.keycloak.services.clientpolicy.executor.HolderOfKeyEnforcerExecutorFa import org.keycloak.services.clientpolicy.executor.SecureSigningAlgorithmForSignedJwtExecutorFactory; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.client.policies.AbstractClientPoliciesTest; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; import org.keycloak.testsuite.rest.representation.TestAuthenticationChannelRequest; import org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResource.AuthorizationEndpointRequestObject; import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExceptionExecutorFactory; +import org.keycloak.testsuite.util.ClientPoliciesUtil; +import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; +import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; +import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; +import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; import org.keycloak.testsuite.util.KeycloakModelUtils; import org.keycloak.testsuite.util.MutualTLSUtils; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.UserBuilder; -import org.keycloak.testsuite.util.ClientPoliciesUtil; -import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; -import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; -import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; -import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.ciba.AuthenticationRequestAcknowledgement; import org.keycloak.testsuite.util.oauth.LogoutResponse; +import org.keycloak.testsuite.util.oauth.ciba.AuthenticationRequestAcknowledgement; import org.keycloak.util.JsonSerialization; -import org.keycloak.testsuite.client.policies.AbstractClientPoliciesTest; + +import org.apache.http.impl.client.CloseableHttpClient; +import org.hamcrest.CoreMatchers; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.CANCELLED; +import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.SUCCEED; +import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.UNAUTHORIZED; +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.Assert.assertExpiration; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureCibaAuthenticationRequestSigningAlgorithmExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Tests for the CIBA "poll" mode and generic CIBA functionality tests diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java index bd14201f884..96ed00d0fbb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRedirectTest.java @@ -17,8 +17,13 @@ package org.keycloak.testsuite.client; -import org.junit.Test; -import org.junit.Rule; +import java.net.URI; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.OAuthErrorException; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.constants.ServiceUrlConstants; @@ -31,18 +36,16 @@ import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; -import java.net.URI; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; +import org.junit.Rule; +import org.junit.Test; +import static org.keycloak.testsuite.util.Matchers.statusCodeIs; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.Matchers.statusCodeIs; /** * @author Thomas Darimont diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java index da077435541..ee61a0e8381 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationPoliciesTest.java @@ -25,8 +25,8 @@ import java.util.UUID; import java.util.stream.Collectors; import jakarta.ws.rs.BadRequestException; -import org.junit.After; -import org.junit.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.RealmResource; @@ -66,7 +66,8 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.util.JsonSerialization; -import jakarta.ws.rs.core.Response; +import org.junit.After; +import org.junit.Test; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java index 4ca0363cdb2..f2cd1cf0859 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientRegistrationTest.java @@ -17,17 +17,27 @@ package org.keycloak.testsuite.client; -import org.apache.http.Header; -import org.apache.http.HeaderElement; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.util.EntityUtils; -import org.hamcrest.CoreMatchers; -import org.hamcrest.Matchers; -import org.junit.Test; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.client.registration.Auth; import org.keycloak.client.registration.ClientRegistration; import org.keycloak.client.registration.ClientRegistrationException; @@ -53,28 +63,24 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.util.JsonSerialization; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; +import org.apache.http.Header; +import org.apache.http.HeaderElement; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; +import org.hamcrest.CoreMatchers; +import org.hamcrest.Matchers; +import org.junit.Test; import static java.util.Arrays.asList; + +import static org.keycloak.services.clientregistration.ErrorCodes.INVALID_CLIENT_METADATA; +import static org.keycloak.services.clientregistration.ErrorCodes.INVALID_REDIRECT_URI; +import static org.keycloak.utils.MediaType.APPLICATION_JSON; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.notNullValue; @@ -86,9 +92,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.services.clientregistration.ErrorCodes.INVALID_CLIENT_METADATA; -import static org.keycloak.services.clientregistration.ErrorCodes.INVALID_REDIRECT_URI; -import static org.keycloak.utils.MediaType.APPLICATION_JSON; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java index 92e6f4f2e98..5372db338d8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientSecretRotationTest.java @@ -14,13 +14,6 @@ import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.jboss.logging.Logger; -import org.jetbrains.annotations.NotNull; -import org.junit.After; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientPoliciesPoliciesResource; import org.keycloak.admin.client.resource.ClientResource; @@ -52,12 +45,22 @@ import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.jboss.logging.Logger; +import org.jetbrains.annotations.NotNull; +import org.junit.After; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.equalTo; @@ -69,7 +72,6 @@ import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; /** * @author Marcelo Sales diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientTypesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientTypesTest.java index 1725d55ffc6..53bcc15e8ba 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientTypesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/ClientTypesTest.java @@ -18,9 +18,15 @@ package org.keycloak.testsuite.client; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; -import org.junit.Test; + import org.keycloak.client.clienttype.ClientTypeException; import org.keycloak.client.clienttype.ClientTypeManager; import org.keycloak.models.ClientModel; @@ -39,11 +45,9 @@ import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.util.ClientBuilder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import org.junit.Test; + +import static org.keycloak.common.Profile.Feature.CLIENT_TYPES; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.everyItem; @@ -53,7 +57,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import static org.keycloak.common.Profile.Feature.CLIENT_TYPES; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/DefaultClientValidationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/DefaultClientValidationTest.java index 5e0b7e39ae0..54816c6ee0a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/DefaultClientValidationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/DefaultClientValidationTest.java @@ -1,8 +1,9 @@ package org.keycloak.testsuite.client; -import org.junit.Test; import org.keycloak.validation.DefaultClientValidationProvider; +import org.junit.Test; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI1Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI1Test.java index 6fdf8764799..cb7ef8f7456 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI1Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI1Test.java @@ -18,8 +18,14 @@ package org.keycloak.testsuite.client; -import org.apache.http.impl.client.DefaultHttpClient; -import org.junit.Test; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.util.Arrays; +import java.util.Collections; +import java.util.Map; +import java.util.function.Function; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -51,21 +57,17 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.PkceGenerator; -import java.security.KeyPair; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.util.Arrays; -import java.util.Collections; -import java.util.Map; -import java.util.function.Function; +import org.apache.http.impl.client.DefaultHttpClient; +import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import static org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; import static org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * Test for the FAPI 1 specifications: * - Financial-grade API Security Profile 1.0 - Part 1: Baseline diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI2DPoPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI2DPoPTest.java index 394d1b2dac6..b1f3831911e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI2DPoPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI2DPoPTest.java @@ -17,10 +17,13 @@ */ package org.keycloak.testsuite.client; +import java.security.KeyPair; +import java.util.Collections; +import java.util.Random; +import java.util.UUID; + import jakarta.ws.rs.HttpMethod; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -48,20 +51,20 @@ import org.keycloak.testsuite.util.oauth.ParResponse; import org.keycloak.testsuite.util.oauth.PkceGenerator; import org.keycloak.util.JWKSUtils; -import java.security.KeyPair; -import java.util.Collections; -import java.util.Random; -import java.util.UUID; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createEcJwk; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createRsaJwk; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.generateEcdsaKey; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.generateSignedDPoPProof; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createEcJwk; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createRsaJwk; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.generateEcdsaKey; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.generateSignedDPoPProof; public class FAPI2DPoPTest extends AbstractFAPI2Test { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI2Test.java index 86637685374..10a3b4b232b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPI2Test.java @@ -17,14 +17,8 @@ */ package org.keycloak.testsuite.client; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.Collections; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -50,6 +44,13 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.ParResponse; import org.keycloak.testsuite.util.oauth.PkceGenerator; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Test for the FAPI 2 specifications (still implementer's draft): * - FAPI 2.0 Security Profile diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPICIBATest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPICIBATest.java index 5a6d18d1a7e..c128d084a6a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPICIBATest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/FAPICIBATest.java @@ -18,19 +18,6 @@ package org.keycloak.testsuite.client; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.keycloak.protocol.oidc.OIDCLoginProtocol.LOGIN_HINT_PARAM; -import static org.keycloak.protocol.oidc.grants.ciba.CibaGrantType.AUTH_REQ_ID; -import static org.keycloak.protocol.oidc.grants.ciba.CibaGrantType.BINDING_MESSAGE; -import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.SUCCEED; -import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.CANCELLED; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; - import java.io.IOException; import java.net.URI; import java.security.KeyPair; @@ -44,11 +31,6 @@ import java.util.Map; import java.util.Optional; import java.util.function.Supplier; -import org.apache.http.NameValuePair; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -77,13 +59,33 @@ import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; import org.keycloak.testsuite.rest.representation.TestAuthenticationChannelRequest; import org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResource.AuthorizationEndpointRequestObject; -import org.keycloak.testsuite.util.MutualTLSUtils; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; +import org.keycloak.testsuite.util.MutualTLSUtils; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.ciba.AuthenticationRequestAcknowledgement; import org.keycloak.util.JsonSerialization; +import org.apache.http.NameValuePair; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Test; + +import static org.keycloak.protocol.oidc.OIDCLoginProtocol.LOGIN_HINT_PARAM; +import static org.keycloak.protocol.oidc.grants.ciba.CibaGrantType.AUTH_REQ_ID; +import static org.keycloak.protocol.oidc.grants.ciba.CibaGrantType.BINDING_MESSAGE; +import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.CANCELLED; +import static org.keycloak.protocol.oidc.grants.ciba.channel.AuthenticationChannelResponse.Status.SUCCEED; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * Test for the FAPI CIBA specifications (still implementer's draft): * - Financial-grade API: Client Initiated Backchannel Authentication Profile diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/InitialAccessTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/InitialAccessTokenTest.java index d4af79e341a..a26131ad76e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/InitialAccessTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/InitialAccessTokenTest.java @@ -17,9 +17,6 @@ package org.keycloak.testsuite.client; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.ClientInitialAccessResource; import org.keycloak.client.registration.Auth; import org.keycloak.client.registration.ClientRegistrationException; @@ -34,6 +31,10 @@ import org.keycloak.representations.idm.ClientInitialAccessPresentation; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testsuite.util.TokenSignatureUtil; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import static org.junit.Assert.assertEquals; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/MutualTLSClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/MutualTLSClientTest.java index 969452f4022..9602e729557 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/MutualTLSClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/MutualTLSClientTest.java @@ -10,15 +10,6 @@ import java.util.List; import java.util.Map; import java.util.function.Supplier; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.BeforeClass; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.authentication.authenticators.client.X509ClientAuthenticator; @@ -31,6 +22,16 @@ import org.keycloak.testsuite.util.KeycloakModelUtils; import org.keycloak.testsuite.util.MutualTLSUtils; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.BeforeClass; +import org.junit.Test; + /** * Mutual TLS Client tests. */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OAuth2_1ConfidentialClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OAuth2_1ConfidentialClientTest.java index 16323550c77..ff7b9ad2779 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OAuth2_1ConfidentialClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OAuth2_1ConfidentialClientTest.java @@ -18,9 +18,11 @@ package org.keycloak.testsuite.client; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; @@ -44,17 +46,16 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.PkceGenerator; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; public class OAuth2_1ConfidentialClientTest extends AbstractFAPITest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OAuth2_1PublicClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OAuth2_1PublicClientTest.java index 8716ccb282c..19e35639a22 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OAuth2_1PublicClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OAuth2_1PublicClientTest.java @@ -18,11 +18,14 @@ package org.keycloak.testsuite.client; +import java.security.KeyPair; +import java.util.Collections; +import java.util.List; +import java.util.UUID; + import jakarta.ws.rs.HttpMethod; import jakarta.ws.rs.core.Response; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.client.registration.ClientRegistrationException; @@ -45,18 +48,18 @@ import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.PkceGenerator; import org.keycloak.testsuite.util.oauth.UserInfoResponse; -import java.security.KeyPair; -import java.util.Collections; -import java.util.List; -import java.util.UUID; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createEcJwk; import static org.keycloak.testsuite.util.ClientPoliciesUtil.generateEcdsaKey; import static org.keycloak.testsuite.util.ClientPoliciesUtil.generateSignedDPoPProof; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class OAuth2_1PublicClientTest extends AbstractFAPITest { private static final String OAUTH2_1_PUBLIC_CLIENT_PROFILE_NAME = "oauth-2-1-for-public-client"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationDefaultSignatureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationDefaultSignatureTest.java index 4864a7da1b5..7d4ff78bd9e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationDefaultSignatureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationDefaultSignatureTest.java @@ -20,8 +20,6 @@ package org.keycloak.testsuite.client; import java.util.Collections; -import org.junit.Before; -import org.junit.Test; import org.keycloak.client.registration.Auth; import org.keycloak.crypto.Algorithm; import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; @@ -32,6 +30,9 @@ import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.TokenSignatureUtil; +import org.junit.Before; +import org.junit.Test; + public class OIDCClientRegistrationDefaultSignatureTest extends AbstractClientRegistrationTest { @Before public void before() throws Exception { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationResponseTypesAndGrantsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationResponseTypesAndGrantsTest.java index cc7e4e4f58f..3edd2fdf873 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationResponseTypesAndGrantsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationResponseTypesAndGrantsTest.java @@ -19,14 +19,11 @@ package org.keycloak.testsuite.client; -import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.List; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuthErrorException; import org.keycloak.client.registration.Auth; import org.keycloak.client.registration.ClientRegistrationException; @@ -37,10 +34,14 @@ import org.keycloak.representations.idm.ClientInitialAccessPresentation; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.OAuth2ErrorRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; -import org.keycloak.util.JsonSerialization; import org.keycloak.testsuite.Assert; +import org.keycloak.util.JsonSerialization; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Before; +import org.junit.Test; -import static org.hamcrest.Matchers.containsInAnyOrder; import static org.keycloak.OAuth2Constants.AUTHORIZATION_CODE; import static org.keycloak.OAuth2Constants.CLIENT_CREDENTIALS; import static org.keycloak.OAuth2Constants.DEVICE_CODE_GRANT_TYPE; @@ -53,6 +54,8 @@ import static org.keycloak.protocol.oidc.utils.OIDCResponseType.CODE; import static org.keycloak.protocol.oidc.utils.OIDCResponseType.ID_TOKEN; import static org.keycloak.protocol.oidc.utils.OIDCResponseType.NONE; +import static org.hamcrest.Matchers.containsInAnyOrder; + /** * Test of OIDC client registration with various combinations of parameters "response_types" and "grant_types" * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java index c383cf2f92d..9f9aff9ad67 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCClientRegistrationTest.java @@ -18,8 +18,17 @@ package org.keycloak.testsuite.client; -import org.junit.Before; -import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -39,31 +48,24 @@ import org.keycloak.protocol.oidc.utils.OIDCResponseType; import org.keycloak.representations.idm.ClientInitialAccessCreatePresentation; import org.keycloak.representations.idm.ClientInitialAccessPresentation; import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.KeycloakModelUtils; import org.keycloak.util.JsonSerialization; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Collectors; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; +import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; -import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java index 512592ea673..8c99e7f3efa 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCJwksClientRegistrationTest.java @@ -27,16 +27,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; - -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Before; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.client.registration.Auth; import org.keycloak.common.util.KeycloakUriBuilder; @@ -63,6 +53,16 @@ import org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResou import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Before; +import org.junit.Test; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java index 7dc80913476..8cf3dd6dc56 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/OIDCPairwiseClientRegistrationTest.java @@ -18,10 +18,14 @@ package org.keycloak.testsuite.client; -import com.fasterxml.jackson.databind.JsonNode; -import org.apache.commons.lang.StringUtils; -import org.junit.Before; -import org.junit.Test; +import java.util.ArrayList; +import java.util.Base64; +import java.util.Collections; +import java.util.List; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.client.registration.Auth; @@ -44,18 +48,16 @@ import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ClientManager; +import org.keycloak.testsuite.util.UserInfoClientUtil; +import org.keycloak.testsuite.util.UserManager; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.UserInfoClientUtil; -import org.keycloak.testsuite.util.UserManager; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.core.Response; -import java.util.ArrayList; -import java.util.Base64; -import java.util.Collections; -import java.util.List; +import com.fasterxml.jackson.databind.JsonNode; +import org.apache.commons.lang.StringUtils; +import org.junit.Before; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/RegistrationAccessTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/RegistrationAccessTokenTest.java index d7ea7f1b3d9..6b31a920ecc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/RegistrationAccessTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/RegistrationAccessTokenTest.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.client; -import org.junit.Before; -import org.junit.Test; import org.keycloak.client.registration.Auth; import org.keycloak.client.registration.ClientRegistrationException; import org.keycloak.client.registration.HttpErrorException; import org.keycloak.representations.idm.ClientRepresentation; +import org.junit.Before; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/SAMLClientRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/SAMLClientRegistrationTest.java index 177a237f84c..d84ed12d0b3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/SAMLClientRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/SAMLClientRegistrationTest.java @@ -17,9 +17,11 @@ package org.keycloak.testsuite.client; -import org.apache.commons.io.IOUtils; -import org.junit.Before; -import org.junit.Test; +import java.io.IOException; +import java.nio.charset.Charset; +import java.util.Arrays; +import java.util.List; + import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.client.registration.Auth; import org.keycloak.client.registration.ClientRegistrationException; @@ -36,16 +38,16 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.KeycloakModelUtils; -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.Arrays; -import java.util.List; +import org.apache.commons.io.IOUtils; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java index 826dcdf4ed2..837d05d6acc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/AbstractClientPoliciesTest.java @@ -17,25 +17,6 @@ package org.keycloak.testsuite.client.policies; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAccessTypeConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceGroupsConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceHostsConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceRolesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createHolderOfKeyEnforceExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createPKCEEnforceExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientAuthenticatorExecutorConfig; - import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -66,21 +47,6 @@ import java.util.stream.Collectors; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.logging.Logger; -import org.jetbrains.annotations.NotNull; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -174,10 +140,10 @@ import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; import org.keycloak.testsuite.util.ClientScopeBuilder; import org.keycloak.testsuite.util.MutualTLSUtils; +import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.SignatureSignerUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.oauth.IntrospectionResponse; import org.keycloak.testsuite.util.oauth.LogoutResponse; import org.keycloak.testsuite.util.oauth.PkceGenerator; @@ -186,6 +152,41 @@ import org.keycloak.util.JsonSerialization; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.logging.Logger; +import org.jetbrains.annotations.NotNull; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; + +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAccessTypeConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceGroupsConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceHostsConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceRolesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createHolderOfKeyEnforceExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createPKCEEnforceExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientAuthenticatorExecutorConfig; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * @author Takashi Norimatsu diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesAdminTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesAdminTest.java index 396eecc2f6f..80d873b9cab 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesAdminTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesAdminTest.java @@ -17,19 +17,11 @@ package org.keycloak.testsuite.client.policies; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientAuthenticatorExecutorConfig; - import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Test; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; @@ -59,6 +51,16 @@ import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientAuthenticatorExecutorConfig; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * This test class is for testing client policies' related actions done through an admin console, admin CLI, and admin REST API. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesConditionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesConditionTest.java index b9745dbdb5a..e83b5303013 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesConditionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesConditionTest.java @@ -17,20 +17,6 @@ package org.keycloak.testsuite.client.policies; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAccessTypeConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAttributesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceGroupsConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceHostsConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceRolesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createPKCEEnforceExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientAuthenticatorExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; - import java.util.Arrays; import java.util.Collections; import java.util.HashMap; @@ -38,8 +24,7 @@ import java.util.LinkedList; import java.util.List; import jakarta.ws.rs.BadRequestException; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; @@ -85,10 +70,28 @@ import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.util.JsonSerialization; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAccessTypeConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAttributesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceGroupsConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceHostsConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateSourceRolesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createPKCEEnforceExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientAuthenticatorExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * This test class is for testing a condition of client policies. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java index 000721f28b3..c08f9340f60 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExecutorTest.java @@ -17,22 +17,6 @@ package org.keycloak.testsuite.client.policies; -import static org.hamcrest.Matchers.emptyOrNullString; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientAuthenticatorExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureRequestObjectExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureResponseTypeExecutor; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureSigningAlgorithmEnforceExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureSigningAlgorithmForSignedJwtEnforceExecutorConfig; - import java.nio.charset.StandardCharsets; import java.security.KeyPair; import java.security.PrivateKey; @@ -49,19 +33,6 @@ import java.util.function.Supplier; import jakarta.ws.rs.BadRequestException; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -131,17 +102,47 @@ import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; +import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.SignatureSignerUtil; +import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.oauth.ParResponse; import org.keycloak.testsuite.util.oauth.PkceGenerator; -import org.keycloak.testsuite.util.RoleBuilder; -import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; import com.fasterxml.jackson.databind.JsonNode; +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientAuthenticatorExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureRequestObjectExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureResponseTypeExecutor; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureSigningAlgorithmEnforceExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureSigningAlgorithmForSignedJwtEnforceExecutorConfig; + +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * This test class is for testing an executor of client policies. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExtendedEventTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExtendedEventTest.java index daaa28ee385..5b82c2b45f4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExtendedEventTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesExtendedEventTest.java @@ -17,27 +17,13 @@ package org.keycloak.testsuite.client.policies; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAccessTypeConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; - -import jakarta.ws.rs.NotFoundException; import java.util.Arrays; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Test; +import jakarta.ws.rs.NotFoundException; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.common.Profile; @@ -73,13 +59,30 @@ import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.device.DeviceAuthorizationResponse; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.device.DeviceAuthorizationResponse; + +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAccessTypeConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * This test class is for testing a newly supported event for client policies. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesFeatureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesFeatureTest.java index 54d265ac88c..811884e2c4a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesFeatureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesFeatureTest.java @@ -20,7 +20,6 @@ package org.keycloak.testsuite.client.policies; import java.util.Set; -import org.junit.Test; import org.keycloak.representations.idm.ClientPoliciesRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.info.ServerInfoRepresentation; @@ -33,9 +32,12 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; -import static org.junit.Assert.fail; +import org.junit.Test; + import static org.keycloak.common.Profile.Feature.CLIENT_POLICIES; +import static org.junit.Assert.fail; + /** * This test class is for enabling and disabling client policies by feature mechanism. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesImportExportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesImportExportTest.java index d4db8f7e0d1..da181cc7adc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesImportExportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesImportExportTest.java @@ -17,8 +17,10 @@ package org.keycloak.testsuite.client.policies; -import org.junit.After; -import org.junit.Test; +import java.io.File; +import java.util.Arrays; +import java.util.List; + import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.singlefile.SingleFileExportProviderFactory; import org.keycloak.representations.idm.ClientPoliciesRepresentation; @@ -28,9 +30,8 @@ import org.keycloak.representations.idm.ClientProfilesRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.Assert; -import java.io.File; -import java.util.Arrays; -import java.util.List; +import org.junit.After; +import org.junit.Test; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesLoadUpdateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesLoadUpdateTest.java index 1e96e6e585d..39e03487647 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesLoadUpdateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesLoadUpdateTest.java @@ -17,8 +17,10 @@ package org.keycloak.testsuite.client.policies; -import org.hamcrest.Matchers; -import org.junit.Test; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; @@ -45,19 +47,19 @@ import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import org.hamcrest.Matchers; +import org.junit.Test; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientAccessTypeConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createPKCEEnforceExecutorConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientAuthenticatorExecutorConfig; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + /** * This test class is for testing loading and updating profiles and policies file of client policies. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java index 5674eb028f0..1b633a5c645 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/ClientPoliciesTest.java @@ -17,36 +17,6 @@ package org.keycloak.testsuite.client.policies; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.emptyOrNullString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createConsentRequiredExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createFullScopeDisabledExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createGrantTypeConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createHolderOfKeyEnforceExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createIntentClientBindCheckExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createPKCEEnforceExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createRejectisResourceOwnerPasswordCredentialsGrantExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createRejectImplicitGrantExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientAuthenticatorExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureSigningAlgorithmForSignedJwtEnforceExecutorConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; - import java.io.IOException; import java.net.URL; import java.util.Arrays; @@ -59,11 +29,6 @@ import java.util.Objects; import jakarta.ws.rs.core.Response; -import org.apache.http.impl.client.CloseableHttpClient; -import org.jboss.logging.Logger; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -129,16 +94,16 @@ import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExceptionE import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil; -import org.keycloak.testsuite.util.MutualTLSUtils; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; +import org.keycloak.testsuite.util.MutualTLSUtils; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.ParResponse; import org.keycloak.util.JsonSerialization; @@ -146,6 +111,42 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.TreeNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.TextNode; +import org.apache.http.impl.client.CloseableHttpClient; +import org.jboss.logging.Logger; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientUpdateContextConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createConsentRequiredExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createFullScopeDisabledExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createGrantTypeConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createHolderOfKeyEnforceExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createIntentClientBindCheckExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createPKCEEnforceExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createRejectImplicitGrantExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createRejectisResourceOwnerPasswordCredentialsGrantExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureClientAuthenticatorExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureSigningAlgorithmForSignedJwtEnforceExecutorConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * @author Takashi Norimatsu diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/SamlClientPoliciesExecutorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/SamlClientPoliciesExecutorTest.java index 90e4a697123..a9e9c9df542 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/SamlClientPoliciesExecutorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/SamlClientPoliciesExecutorTest.java @@ -16,20 +16,17 @@ */ package org.keycloak.testsuite.client.policies; -import jakarta.ws.rs.ClientErrorException; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.function.Function; -import org.apache.http.util.EntityUtils; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Test; + +import jakarta.ws.rs.ClientErrorException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.Constants; @@ -59,6 +56,12 @@ import org.keycloak.testsuite.util.ClientPoliciesUtil; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; +import org.apache.http.util.EntityUtils; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Test; + /** * * @author rmartinc diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/SecureRedirectUrisEnforcerExecutorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/SecureRedirectUrisEnforcerExecutorTest.java index 09763f82dea..b65dbf965a5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/SecureRedirectUrisEnforcerExecutorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/client/policies/SecureRedirectUrisEnforcerExecutorTest.java @@ -16,15 +16,11 @@ */ package org.keycloak.testsuite.client.policies; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureRedirectUrisEnforcerExecutorConfig; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.OAuthErrorException; import org.keycloak.client.registration.ClientRegistrationException; import org.keycloak.events.Errors; @@ -35,14 +31,20 @@ import org.keycloak.services.clientpolicy.ClientPolicyException; import org.keycloak.services.clientpolicy.condition.AnyClientConditionFactory; import org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutorFactory; import org.keycloak.testsuite.util.ClientPoliciesUtil; +import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import org.keycloak.testsuite.util.ServerURLs; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createSecureRedirectUrisEnforcerExecutorConfig; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class SecureRedirectUrisEnforcerExecutorTest extends AbstractClientPoliciesTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java index b4335a72d83..c1bff4158a6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractClusterTest.java @@ -1,10 +1,11 @@ package org.keycloak.testsuite.cluster; -import org.jboss.arquillian.container.test.api.ContainerController; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.keycloak.admin.client.Keycloak; import org.keycloak.models.Constants; import org.keycloak.representations.idm.RealmRepresentation; @@ -14,17 +15,18 @@ import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.utils.tls.TLSUtils; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.jboss.arquillian.container.test.api.ContainerController; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; -import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.auth.page.AuthRealm.ADMIN; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; import static org.keycloak.testsuite.util.WaitUtils.pause; +import static org.junit.Assert.assertTrue; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java index 9716a0e6084..79b3e29204a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractFailoverClusterTest.java @@ -18,11 +18,6 @@ package org.keycloak.testsuite.cluster; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; @@ -32,19 +27,26 @@ import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.InfoPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LogoutConfirmPage; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.URLUtils; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; import org.openqa.selenium.Cookie; +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.util.WaitUtils.pause; +import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; -import static org.keycloak.testsuite.util.WaitUtils.pause; public abstract class AbstractFailoverClusterTest extends AbstractClusterTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractInvalidationClusterTest.java index 018cc1a94ee..7287623ab02 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractInvalidationClusterTest.java @@ -1,24 +1,26 @@ package org.keycloak.testsuite.cluster; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.arquillian.ContainerInfo; + import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; import org.junit.Test; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.arquillian.ContainerInfo; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import static org.junit.Assert.assertFalse; import static org.keycloak.common.util.reflections.Reflections.resolveListType; import static org.keycloak.common.util.reflections.Reflections.setAccessible; import static org.keycloak.common.util.reflections.Reflections.unsetAccessible; +import static org.junit.Assert.assertFalse; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractInvalidationClusterTestWithTestRealm.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractInvalidationClusterTestWithTestRealm.java index 0fe6c0df66f..764e34e2e8f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractInvalidationClusterTestWithTestRealm.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AbstractInvalidationClusterTestWithTestRealm.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.cluster; -import org.junit.Before; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.arquillian.ContainerInfo; +import org.junit.Before; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionClusterTest.java index b09a0ec80de..d0c5c7eff1c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionClusterTest.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.cluster; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import java.util.HashSet; +import java.util.Set; + +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.AuthenticationSessionManager; @@ -33,16 +33,19 @@ import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.pages.LoginUpdateProfilePage; import org.keycloak.testsuite.util.oauth.OAuthClient; -import jakarta.ws.rs.core.UriBuilder; -import java.util.HashSet; -import java.util.Set; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java index 90378443bb0..ba809232389 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/AuthenticationSessionFailoverClusterTest.java @@ -17,20 +17,24 @@ package org.keycloak.testsuite.cluster; -import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.util.WaitUtils.pause; - import java.io.IOException; + import jakarta.mail.MessagingException; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Test; + import org.keycloak.cookie.CookieType; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.pages.LoginUpdateProfilePage; + +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Test; import org.openqa.selenium.Cookie; import org.openqa.selenium.WebDriver; +import static org.keycloak.testsuite.util.WaitUtils.pause; + +import static org.junit.Assert.assertEquals; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientInvalidationClusterTest.java index bb200626143..975806a2f12 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientInvalidationClusterTest.java @@ -1,15 +1,16 @@ package org.keycloak.testsuite.cluster; -import org.apache.commons.lang.RandomStringUtils; -import org.junit.Before; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.ContainerInfo; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; +import org.apache.commons.lang.RandomStringUtils; +import org.junit.Before; import static org.junit.Assert.assertNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientScopeInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientScopeInvalidationClusterTest.java index b9f829e16df..78af28b6052 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientScopeInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ClientScopeInvalidationClusterTest.java @@ -20,6 +20,7 @@ package org.keycloak.testsuite.cluster; import java.util.Map; import jakarta.ws.rs.NotFoundException; + import org.keycloak.admin.client.resource.ClientScopeResource; import org.keycloak.admin.client.resource.ClientScopesResource; import org.keycloak.representations.idm.ClientScopeRepresentation; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ComponentInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ComponentInvalidationClusterTest.java index 2d167e496d6..589e82f01d1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ComponentInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/ComponentInvalidationClusterTest.java @@ -1,7 +1,11 @@ package org.keycloak.testsuite.cluster; -import org.apache.commons.lang.RandomStringUtils; -import org.junit.Before; +import java.util.Arrays; +import java.util.Map; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ComponentResource; import org.keycloak.admin.client.resource.ComponentsResource; import org.keycloak.common.util.MultivaluedHashMap; @@ -11,12 +15,10 @@ import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.components.amphibian.TestAmphibianProvider; import org.keycloak.testsuite.components.amphibian.TestAmphibianProviderFactoryImpl; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; -import java.util.Arrays; - -import java.util.Map; +import org.apache.commons.lang.RandomStringUtils; +import org.junit.Before; import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.hasEntry; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java index 613f3f588bb..15e88599c34 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/GroupInvalidationClusterTest.java @@ -1,7 +1,12 @@ package org.keycloak.testsuite.cluster; -import org.apache.commons.lang.RandomStringUtils; -import org.junit.Before; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.GroupResource; import org.keycloak.admin.client.resource.GroupsResource; import org.keycloak.admin.client.resource.RealmResource; @@ -10,16 +15,14 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.util.GroupBuilder; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; +import org.apache.commons.lang.RandomStringUtils; +import org.junit.Before; + +import static org.keycloak.testsuite.Assert.assertNames; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.Assert.assertNames; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/JGroupsCertificateRotationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/JGroupsCertificateRotationClusterTest.java index 42560e58a24..a365474d00f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/JGroupsCertificateRotationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/JGroupsCertificateRotationClusterTest.java @@ -3,16 +3,17 @@ package org.keycloak.testsuite.cluster; import java.time.Duration; import java.time.temporal.ChronoUnit; +import org.keycloak.connections.infinispan.InfinispanConnectionProvider; +import org.keycloak.jgroups.certificates.CertificateReloadManager; +import org.keycloak.jgroups.certificates.DatabaseJGroupsCertificateProvider; +import org.keycloak.models.KeycloakSession; +import org.keycloak.spi.infinispan.JGroupsCertificateProvider; + import org.awaitility.Awaitility; import org.infinispan.factories.GlobalComponentRegistry; import org.infinispan.manager.EmbeddedCacheManager; import org.junit.Assume; import org.junit.Test; -import org.keycloak.connections.infinispan.InfinispanConnectionProvider; -import org.keycloak.jgroups.certificates.CertificateReloadManager; -import org.keycloak.jgroups.certificates.DatabaseJGroupsCertificateProvider; -import org.keycloak.models.KeycloakSession; -import org.keycloak.spi.infinispan.JGroupsCertificateProvider; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -209,5 +210,3 @@ public class JGroupsCertificateRotationClusterTest extends AbstractClusterTest { } } - - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/PermissionTicketInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/PermissionTicketInvalidationClusterTest.java index 7a4826dc598..7df4930602c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/PermissionTicketInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/PermissionTicketInvalidationClusterTest.java @@ -19,7 +19,6 @@ package org.keycloak.testsuite.cluster; import java.util.concurrent.ThreadLocalRandom; -import org.apache.commons.lang.RandomStringUtils; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.AuthorizationProviderFactory; import org.keycloak.models.utils.ModelToRepresentation; @@ -28,6 +27,8 @@ import org.keycloak.representations.idm.authorization.PermissionTicketRepresenta import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.ContainerInfo; +import org.apache.commons.lang.RandomStringUtils; + import static org.junit.Assert.assertEquals; public class PermissionTicketInvalidationClusterTest extends AbstractInvalidationClusterTestWithTestRealm { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RealmInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RealmInvalidationClusterTest.java index 96f40df4555..b5743a240cd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RealmInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RealmInvalidationClusterTest.java @@ -1,12 +1,12 @@ package org.keycloak.testsuite.cluster; +import jakarta.ws.rs.NotFoundException; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.RealmsResource; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.arquillian.ContainerInfo; -import jakarta.ws.rs.NotFoundException; - import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RoleInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RoleInvalidationClusterTest.java index c1d62ac761b..d459851fede 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RoleInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/RoleInvalidationClusterTest.java @@ -22,12 +22,9 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.apache.commons.lang.builder.ToStringStyle; -import org.junit.Before; + +import jakarta.ws.rs.NotFoundException; + import org.keycloak.admin.client.resource.RoleByIdResource; import org.keycloak.admin.client.resource.RoleResource; import org.keycloak.admin.client.resource.RolesResource; @@ -35,14 +32,20 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.util.RoleBuilder; -import jakarta.ws.rs.NotFoundException; +import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.ReflectionToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; +import org.junit.Before; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.keycloak.common.util.reflections.Reflections.resolveListType; import static org.keycloak.common.util.reflections.Reflections.setAccessible; import static org.keycloak.common.util.reflections.Reflections.unsetAccessible; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/SessionFailoverClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/SessionFailoverClusterTest.java index 8188ff29177..4282f169d0b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/SessionFailoverClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/SessionFailoverClusterTest.java @@ -4,9 +4,10 @@ import org.junit.Before; import org.junit.Test; import org.openqa.selenium.Cookie; -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.util.WaitUtils.pause; +import static org.junit.Assert.assertEquals; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserFederationInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserFederationInvalidationClusterTest.java index 128a256bcb0..3c6939066ef 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserFederationInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserFederationInvalidationClusterTest.java @@ -1,7 +1,8 @@ package org.keycloak.testsuite.cluster; -import org.apache.commons.lang.RandomStringUtils; -import org.junit.Before; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ComponentResource; import org.keycloak.admin.client.resource.ComponentsResource; import org.keycloak.representations.idm.ComponentRepresentation; @@ -10,8 +11,8 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.ContainerInfo; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; +import org.apache.commons.lang.RandomStringUtils; +import org.junit.Before; import static org.junit.Assert.assertNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserInvalidationClusterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserInvalidationClusterTest.java index 92459c2a9f3..11d77b3ae3e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserInvalidationClusterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cluster/UserInvalidationClusterTest.java @@ -1,14 +1,15 @@ package org.keycloak.testsuite.cluster; -import org.apache.commons.lang.RandomStringUtils; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.ContainerInfo; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; +import org.apache.commons.lang.RandomStringUtils; import static org.junit.Assert.assertNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeImportRoleTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeImportRoleTest.java index 36ed90f156e..bda767830e7 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeImportRoleTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeImportRoleTest.java @@ -16,15 +16,16 @@ */ package org.keycloak.testsuite.composites; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Test; +import java.util.List; + import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.List; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Test; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java index cdee1f52b28..99250a8bd62 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/composites/CompositeRoleTest.java @@ -16,9 +16,10 @@ */ package org.keycloak.testsuite.composites; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Test; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.RoleResource; import org.keycloak.admin.client.resource.UserResource; @@ -30,15 +31,15 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.ClientBuilder; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Test; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java index 1e0a4961f69..e10f6f50034 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/CookieTest.java @@ -16,6 +16,27 @@ */ package org.keycloak.testsuite.cookies; +import java.io.IOException; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import jakarta.ws.rs.core.HttpHeaders; + +import org.keycloak.cookie.CookieType; +import org.keycloak.models.Constants; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.auth.page.AuthRealm; +import org.keycloak.testsuite.pages.AppPage; +import org.keycloak.testsuite.pages.LoginPage; +import org.keycloak.testsuite.util.AccountHelper; +import org.keycloak.testsuite.util.ContainerAssume; +import org.keycloak.testsuite.util.HttpClientUtils; +import org.keycloak.testsuite.util.RealmBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; + import org.apache.http.Header; import org.apache.http.client.CookieStore; import org.apache.http.client.methods.CloseableHttpResponse; @@ -31,34 +52,15 @@ import org.apache.http.util.EntityUtils; import org.jboss.arquillian.graphene.page.Page; import org.junit.Before; import org.junit.Test; -import org.keycloak.cookie.CookieType; -import org.keycloak.models.Constants; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.auth.page.AuthRealm; -import org.keycloak.testsuite.pages.AppPage; -import org.keycloak.testsuite.pages.LoginPage; -import org.keycloak.testsuite.util.AccountHelper; -import org.keycloak.testsuite.util.ContainerAssume; -import org.keycloak.testsuite.util.HttpClientUtils; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import org.keycloak.testsuite.util.RealmBuilder; import org.openqa.selenium.Cookie; -import java.io.IOException; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertFalse; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; - -import jakarta.ws.rs.core.HttpHeaders; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/DefaultCookieProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/DefaultCookieProviderTest.java index b866dd785e6..200169ed22c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/DefaultCookieProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/cookies/DefaultCookieProviderTest.java @@ -1,25 +1,27 @@ package org.keycloak.testsuite.cookies; +import java.io.IOException; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestFilter; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.NewCookie; import jakarta.ws.rs.core.Response; -import org.jboss.resteasy.client.jaxrs.ResteasyClient; -import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.cookie.CookieProvider; import org.keycloak.cookie.CookieType; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.client.KeycloakTestingClient; -import java.io.IOException; -import java.util.List; -import java.util.Map; +import org.jboss.resteasy.client.jaxrs.ResteasyClient; +import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; public class DefaultCookieProviderTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java index a6e3331468b..40d872085d4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerClientTest.java @@ -1,23 +1,5 @@ package org.keycloak.testsuite.docker; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.keycloak.common.Profile; -import org.keycloak.common.util.PemUtils; -import org.keycloak.crypto.KeyStatus; -import org.keycloak.models.Constants; -import org.keycloak.representations.idm.KeysMetadataRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; -import org.slf4j.LoggerFactory; -import org.testcontainers.containers.BindMode; -import org.testcontainers.containers.Container; -import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.output.Slf4jLogConsumer; -import org.testcontainers.containers.wait.strategy.Wait; - import java.io.File; import java.io.PrintWriter; import java.time.Duration; @@ -26,11 +8,31 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import org.keycloak.common.Profile; +import org.keycloak.common.util.PemUtils; +import org.keycloak.crypto.KeyStatus; +import org.keycloak.models.Constants; +import org.keycloak.representations.idm.KeysMetadataRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.arquillian.annotation.EnableFeature; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.BindMode; +import org.testcontainers.containers.Container; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.containers.wait.strategy.Wait; + +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT_HTTP; +import static org.keycloak.testsuite.util.WaitUtils.pause; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.Assume.assumeTrue; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT_HTTP; -import static org.keycloak.testsuite.util.WaitUtils.pause; @EnableFeature(Profile.Feature.DOCKER) public class DockerClientTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerHostVersionSupplier.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerHostVersionSupplier.java index eac009228e8..625d5ca7eaa 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerHostVersionSupplier.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerHostVersionSupplier.java @@ -1,8 +1,5 @@ package org.keycloak.testsuite.docker; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -12,6 +9,9 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class DockerHostVersionSupplier implements Supplier> { private static final Logger log = LoggerFactory.getLogger(DockerHostVersionSupplier.class); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerTestRealmSetup.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerTestRealmSetup.java index 6e711f06879..9032e1982a1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerTestRealmSetup.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/docker/DockerTestRealmSetup.java @@ -1,17 +1,17 @@ package org.keycloak.testsuite.docker; -import org.keycloak.protocol.docker.DockerAuthV2Protocol; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.CredentialRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.representations.idm.UserRepresentation; - import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.UUID; +import org.keycloak.protocol.docker.DockerAuthV2Protocol; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.CredentialRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.representations.idm.UserRepresentation; + public final class DockerTestRealmSetup { private DockerTestRealmSetup() { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/domainextension/CustomExtensionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/domainextension/CustomExtensionTest.java index 004f33b1e05..ff0727ef5be 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/domainextension/CustomExtensionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/domainextension/CustomExtensionTest.java @@ -17,16 +17,17 @@ package org.keycloak.testsuite.domainextension; -import org.junit.Test; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.client.resources.TestExampleCompanyResource; import org.keycloak.testsuite.util.RealmBuilder; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import org.junit.Test; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/EscapeErrorPageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/EscapeErrorPageTest.java index 06b7a1bee05..cb31f742112 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/EscapeErrorPageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/EscapeErrorPageTest.java @@ -17,16 +17,17 @@ package org.keycloak.testsuite.error; -import org.hamcrest.CoreMatchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Test; +import java.net.URI; +import java.util.List; + import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.pages.ErrorPage; -import java.net.URI; -import java.util.List; +import org.hamcrest.CoreMatchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java index 9773e6f0f77..ca0ff8a752a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/error/UncaughtErrorPageTest.java @@ -1,32 +1,5 @@ package org.keycloak.testsuite.error; -import org.apache.http.Header; -import org.apache.http.HeaderElement; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.util.EntityUtils; -import org.hamcrest.CoreMatchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.OAuthErrorException; -import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.common.util.StreamUtil; -import org.keycloak.http.simple.SimpleHttpResponse; -import org.keycloak.models.BrowserSecurityHeaders; -import org.keycloak.representations.idm.OAuth2ErrorRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; -import org.keycloak.testsuite.broker.util.SimpleHttpDefault; -import org.keycloak.testsuite.pages.ErrorPage; -import org.keycloak.util.JsonSerialization; -import org.keycloak.utils.MediaType; -import org.openqa.selenium.By; - import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; @@ -40,6 +13,36 @@ import java.util.Objects; import jakarta.ws.rs.core.Response; +import org.keycloak.OAuthErrorException; +import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.common.util.StreamUtil; +import org.keycloak.http.simple.SimpleHttpResponse; +import org.keycloak.models.BrowserSecurityHeaders; +import org.keycloak.representations.idm.OAuth2ErrorRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; +import org.keycloak.testsuite.broker.util.SimpleHttpDefault; +import org.keycloak.testsuite.pages.ErrorPage; +import org.keycloak.util.JsonSerialization; +import org.keycloak.utils.MediaType; + +import org.apache.http.Header; +import org.apache.http.HeaderElement; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; +import org.hamcrest.CoreMatchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.By; + +import static org.keycloak.utils.MediaType.APPLICATION_JSON; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.core.Is.is; @@ -47,7 +50,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.utils.MediaType.APPLICATION_JSON; public class UncaughtErrorPageTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AbstractEventsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AbstractEventsTest.java index a7fdda4c8de..8d16ba7d89e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AbstractEventsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AbstractEventsTest.java @@ -17,14 +17,15 @@ package org.keycloak.testsuite.events; -import org.junit.Before; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.client.resources.TestingResource; import org.keycloak.testsuite.util.RealmBuilder; -import java.util.ArrayList; -import java.util.List; +import org.junit.Before; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AdminEventStoreProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AdminEventStoreProviderTest.java index 7f384444f6a..a703f646674 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AdminEventStoreProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/AdminEventStoreProviderTest.java @@ -17,21 +17,21 @@ package org.keycloak.testsuite.events; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; + import org.keycloak.events.admin.OperationType; import org.keycloak.models.jpa.entities.RealmAttributes; import org.keycloak.representations.idm.AdminEventRepresentation; import org.keycloak.representations.idm.AuthDetailsRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -import java.util.List; -import java.util.Map; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; /** * @author Giriraj Sharma diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventMetricsProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventMetricsProviderTest.java index 959114a3c7c..d2305bb9db9 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventMetricsProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventMetricsProviderTest.java @@ -17,11 +17,9 @@ package org.keycloak.testsuite.events; -import io.micrometer.core.instrument.Metrics; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.common.Profile; import org.keycloak.events.Details; import org.keycloak.events.Errors; @@ -35,8 +33,11 @@ import org.keycloak.testsuite.arquillian.containers.AbstractQuarkusDeployableCon import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.util.RealmBuilder; -import java.util.ArrayList; -import java.util.List; +import io.micrometer.core.instrument.Metrics; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.After; +import org.junit.Test; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventStoreProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventStoreProviderTest.java index 46d7346ea7b..8c577966cc7 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventStoreProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/events/EventStoreProviderTest.java @@ -17,20 +17,6 @@ package org.keycloak.testsuite.events; -import org.apache.commons.lang3.StringUtils; -import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.keycloak.events.Errors; -import org.keycloak.events.EventBuilder; -import org.keycloak.events.EventType; -import org.keycloak.models.RealmModel; -import org.keycloak.representations.idm.EventRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.AssertEvents; - import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -42,6 +28,21 @@ import java.util.List; import java.util.Map; import java.util.Random; +import org.keycloak.events.Errors; +import org.keycloak.events.EventBuilder; +import org.keycloak.events.EventType; +import org.keycloak.models.RealmModel; +import org.keycloak.representations.idm.EventRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AssertEvents; + +import org.apache.commons.lang3.StringUtils; +import org.hamcrest.Matchers; +import org.junit.After; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; + /** * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java index 91de86e6bbb..2b8ffac75d5 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java @@ -17,11 +17,18 @@ package org.keycloak.testsuite.exportimport; -import org.apache.commons.io.FileUtils; -import org.hamcrest.Matchers; -import org.jboss.arquillian.container.spi.client.container.LifecycleException; -import org.junit.After; -import org.junit.Test; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.requiredactions.WebAuthnRegisterFactory; import org.keycloak.common.util.MultivaluedHashMap; @@ -52,27 +59,22 @@ import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.userprofile.DeclarativeUserProfileProvider; import org.keycloak.util.JsonSerialization; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.net.URL; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.Set; +import org.apache.commons.io.FileUtils; +import org.hamcrest.Matchers; +import org.jboss.arquillian.container.spi.client.container.LifecycleException; +import org.junit.After; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportUtil.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportUtil.java index 6e0d27f918a..5e49df7070b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportUtil.java @@ -17,7 +17,19 @@ package org.keycloak.testsuite.exportimport; -import org.junit.Assert; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.AuthorizationResource; @@ -64,24 +76,12 @@ import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.client.KeycloakTestingClient; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; +import org.keycloak.util.JsonSerialization; import org.hamcrest.Matcher; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.keycloak.util.JsonSerialization; +import org.junit.Assert; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/feature/AbstractFeatureStateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/feature/AbstractFeatureStateTest.java index d818372f3b2..fc7c836d534 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/feature/AbstractFeatureStateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/feature/AbstractFeatureStateTest.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.feature; -import org.junit.Assert; -import org.junit.Test; +import java.util.Set; + import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.info.ServerInfoRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import java.util.Set; +import org.junit.Assert; +import org.junit.Test; /** * Abstract test class for asserting a state of a particular feature after enabling/disabling diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/feature/RecoveryAuthnCodesFeatureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/feature/RecoveryAuthnCodesFeatureTest.java index 81204dc84a3..53edac9078e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/feature/RecoveryAuthnCodesFeatureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/feature/RecoveryAuthnCodesFeatureTest.java @@ -17,12 +17,13 @@ package org.keycloak.testsuite.feature; -import org.junit.Test; import org.keycloak.authentication.AuthenticatorSpi; import org.keycloak.authentication.authenticators.browser.RecoveryAuthnCodesFormAuthenticatorFactory; import org.keycloak.common.Profile; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; +import org.junit.Test; + public class RecoveryAuthnCodesFeatureTest extends AbstractFeatureStateTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/UserStorageGracefulDegradationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/UserStorageGracefulDegradationTest.java index e0ec9ee046b..bb388349d03 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/UserStorageGracefulDegradationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/UserStorageGracefulDegradationTest.java @@ -16,10 +16,13 @@ */ package org.keycloak.testsuite.federation; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -30,16 +33,14 @@ import org.keycloak.storage.UserStorageProvider; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; -import java.io.Serializable; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Stream; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasItems; import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.hasItems; /** * Test graceful degradation when user storage providers fail. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java index bb7bade945d..2d25fe6cfc0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosSingleRealmTest.java @@ -23,10 +23,6 @@ import java.util.concurrent.atomic.AtomicReference; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import org.ietf.jgss.GSSCredential; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assume; -import org.junit.Test; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.common.constants.KerberosConstants; import org.keycloak.common.util.KerberosSerializationUtils; @@ -44,9 +40,13 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.AccountHelper; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.TestAppHelper; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.ietf.jgss.GSSCredential; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assume; +import org.junit.Test; import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java index 53937e74c96..636ae7c9525 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/AbstractKerberosTest.java @@ -17,10 +17,6 @@ package org.keycloak.testsuite.federation.kerberos; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; - -import jakarta.ws.rs.core.Response; import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.Collections; @@ -36,26 +32,7 @@ import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; import javax.security.sasl.Sasl; -import org.apache.http.NameValuePair; -import org.apache.http.auth.AuthSchemeProvider; -import org.apache.http.auth.AuthScope; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.HttpClient; -import org.apache.http.client.config.AuthSchemes; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.utils.URLEncodedUtils; -import org.apache.http.config.RegistryBuilder; -import org.apache.http.impl.client.BasicCredentialsProvider; -import org.apache.http.impl.client.HttpClientBuilder; -import org.ietf.jgss.GSSCredential; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.resteasy.client.jaxrs.ResteasyClient; -import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; -import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; +import jakarta.ws.rs.core.Response; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.RealmResource; @@ -86,6 +63,30 @@ import org.keycloak.testsuite.util.KerberosRule; import org.keycloak.testsuite.util.KerberosUtils; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.apache.http.NameValuePair; +import org.apache.http.auth.AuthSchemeProvider; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.HttpClient; +import org.apache.http.client.config.AuthSchemes; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.utils.URLEncodedUtils; +import org.apache.http.config.RegistryBuilder; +import org.apache.http.impl.client.BasicCredentialsProvider; +import org.apache.http.impl.client.HttpClientBuilder; +import org.ietf.jgss.GSSCredential; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.resteasy.client.jaxrs.ResteasyClient; +import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; +import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine; +import org.junit.After; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; + /** * Contains just helper methods. No test methods. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapCrossRealmTrustTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapCrossRealmTrustTest.java index fbe41393e02..ae012702ec2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapCrossRealmTrustTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapCrossRealmTrustTest.java @@ -17,10 +17,8 @@ package org.keycloak.testsuite.federation.kerberos; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import jakarta.ws.rs.core.Response; + import org.keycloak.common.constants.KerberosConstants; import org.keycloak.federation.kerberos.CommonKerberosConfig; import org.keycloak.representations.AccessToken; @@ -28,12 +26,15 @@ import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.storage.ldap.LDAPStorageProviderFactory; import org.keycloak.storage.ldap.kerberos.LDAPProviderKerberosConfig; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.util.KerberosRule; import org.keycloak.testsuite.KerberosEmbeddedServer; +import org.keycloak.testsuite.util.KerberosRule; +import org.keycloak.testsuite.util.TestAppHelper; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import jakarta.ws.rs.core.Response; -import org.keycloak.testsuite.util.TestAppHelper; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapMultipleLDAPProvidersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapMultipleLDAPProvidersTest.java index efb500a16a5..81a11be1e99 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapMultipleLDAPProvidersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapMultipleLDAPProvidersTest.java @@ -20,10 +20,7 @@ package org.keycloak.testsuite.federation.kerberos; import jakarta.ws.rs.core.Response; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; + import org.keycloak.common.constants.KerberosConstants; import org.keycloak.component.PrioritizedComponentModel; import org.keycloak.federation.kerberos.CommonKerberosConfig; @@ -39,6 +36,11 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.KerberosRule; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapTest.java index 78890bcbdb9..6c789c29796 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosLdapTest.java @@ -21,9 +21,6 @@ import java.util.List; import jakarta.ws.rs.core.Response; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; import org.keycloak.events.Details; import org.keycloak.federation.kerberos.CommonKerberosConfig; import org.keycloak.models.KeycloakSessionFactory; @@ -40,15 +37,19 @@ import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.ldap.kerberos.LDAPProviderKerberosConfig; import org.keycloak.storage.managers.UserStorageSyncManager; import org.keycloak.storage.user.SynchronizationResult; +import org.keycloak.testsuite.KerberosEmbeddedServer; import org.keycloak.testsuite.federation.ldap.LDAPTestAsserts; import org.keycloak.testsuite.federation.ldap.LDAPTestContext; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.util.KerberosRule; -import org.keycloak.testsuite.KerberosEmbeddedServer; import org.keycloak.testsuite.util.LDAPTestUtils; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.TestAppHelper; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Test; import static org.keycloak.common.constants.KerberosConstants.KERBEROS_PRINCIPAL; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneCrossRealmTrustTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneCrossRealmTrustTest.java index 2d8dcc625fd..e1c4947d341 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneCrossRealmTrustTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneCrossRealmTrustTest.java @@ -17,20 +17,21 @@ package org.keycloak.testsuite.federation.kerberos; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.federation.kerberos.CommonKerberosConfig; import org.keycloak.federation.kerberos.KerberosConfig; import org.keycloak.federation.kerberos.KerberosFederationProviderFactory; import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.util.KerberosRule; import org.keycloak.testsuite.KerberosEmbeddedServer; +import org.keycloak.testsuite.util.KerberosRule; import org.keycloak.testsuite.util.TestAppHelper; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneMultipleProvidersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneMultipleProvidersTest.java index 8ac30a8c498..12abaf6ff84 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneMultipleProvidersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneMultipleProvidersTest.java @@ -20,10 +20,7 @@ package org.keycloak.testsuite.federation.kerberos; import jakarta.ws.rs.core.Response; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; + import org.keycloak.common.constants.KerberosConstants; import org.keycloak.component.PrioritizedComponentModel; import org.keycloak.federation.kerberos.CommonKerberosConfig; @@ -40,6 +37,11 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.KerberosRule; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java index c3d77e738ab..593902bbd20 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KerberosStandaloneTest.java @@ -17,23 +17,16 @@ package org.keycloak.testsuite.federation.kerberos; +import java.net.URI; +import java.util.List; + import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.Form; import jakarta.ws.rs.core.MultivaluedMap; import jakarta.ws.rs.core.Response; -import java.net.URI; -import java.util.List; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.jsoup.Jsoup; -import org.jsoup.nodes.Document; -import org.jsoup.select.Elements; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.constants.KerberosConstants; import org.keycloak.events.Details; @@ -61,6 +54,16 @@ import org.keycloak.testsuite.util.KerberosRule; import org.keycloak.testsuite.util.MailUtils; import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; +import org.jsoup.select.Elements; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; + import static org.keycloak.userprofile.UserProfileUtil.USER_METADATA_GROUP; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KeycloakSPNegoSchemeFactory.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KeycloakSPNegoSchemeFactory.java index 00a722b4561..fee8fc62396 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KeycloakSPNegoSchemeFactory.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/kerberos/KeycloakSPNegoSchemeFactory.java @@ -17,6 +17,12 @@ package org.keycloak.testsuite.federation.kerberos; +import java.security.PrivilegedExceptionAction; +import javax.security.auth.Subject; + +import org.keycloak.federation.kerberos.CommonKerberosConfig; +import org.keycloak.federation.kerberos.impl.KerberosUsernamePasswordAuthenticator; + import org.apache.http.auth.AuthScheme; import org.apache.http.auth.Credentials; import org.apache.http.impl.auth.SPNegoScheme; @@ -28,12 +34,6 @@ import org.ietf.jgss.GSSException; import org.ietf.jgss.GSSManager; import org.ietf.jgss.GSSName; import org.ietf.jgss.Oid; -import org.keycloak.federation.kerberos.CommonKerberosConfig; -import org.keycloak.federation.kerberos.impl.KerberosUsernamePasswordAuthenticator; - -import javax.security.auth.Subject; - -import java.security.PrivilegedExceptionAction; /** * Usable for testing only. Username and password are shared for the whole factory diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/AbstractLDAPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/AbstractLDAPTest.java index 03073df89d9..7d5feb6255c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/AbstractLDAPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/AbstractLDAPTest.java @@ -19,8 +19,6 @@ package org.keycloak.testsuite.federation.ldap; import java.util.Map; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Rule; import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.ldap.mappers.LDAPStorageMapper; @@ -34,6 +32,9 @@ import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.util.LDAPRule; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Rule; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAccountRestApiTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAccountRestApiTest.java index 0ae063838a3..5219448ceee 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAccountRestApiTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAccountRestApiTest.java @@ -21,17 +21,6 @@ package org.keycloak.testsuite.federation.ldap; import java.io.IOException; import java.util.List; -import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.federation.kerberos.KerberosFederationProvider; @@ -52,6 +41,18 @@ import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.TokenUtil; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runners.MethodSorters; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java index 1ef36debd26..3eaa7752045 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPAdminRestApiTest.java @@ -27,11 +27,6 @@ import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.WebApplicationException; import jakarta.ws.rs.core.Response; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.federation.kerberos.KerberosFederationProvider; import org.keycloak.models.LDAPConstants; @@ -50,16 +45,23 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.setUserProfileConfiguration; +import static org.keycloak.util.JsonSerialization.writeValueAsString; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.contains; import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.setUserProfileConfiguration; -import static org.keycloak.util.JsonSerialization.writeValueAsString; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPBinaryAttributesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPBinaryAttributesTest.java index 3535ee725f4..bbf6b8410e8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPBinaryAttributesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPBinaryAttributesTest.java @@ -17,12 +17,14 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.After; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Stream; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.component.ComponentModel; import org.keycloak.component.ComponentValidationException; @@ -44,20 +46,19 @@ import org.keycloak.storage.ldap.mappers.UserAttributeLDAPStorageMapper; import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; - -import jakarta.ws.rs.core.Response; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.validate.validators.LengthValidator; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Stream; +import org.junit.After; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPCountQueryTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPCountQueryTest.java index 832bbe9425c..6cb64ad327d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPCountQueryTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPCountQueryTest.java @@ -23,13 +23,7 @@ import java.io.IOException; import java.net.URISyntaxException; import java.util.Map; import java.util.stream.Collectors; -import org.apache.commons.io.FileUtils; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.RealmModel; @@ -38,6 +32,15 @@ import org.keycloak.testsuite.federation.UserPropertyFileStorageFactory; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; +import org.apache.commons.io.FileUtils; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; + /** * It tests correct behavior when using {@code firstResult} during querying users * with a provider not-implementing {@code UserCountMethodsProvider} - LDAPStorageProvider. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPExternalChangesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPExternalChangesTest.java index 1b8303c6ea0..63cb9b16a59 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPExternalChangesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPExternalChangesTest.java @@ -17,12 +17,8 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.List; + import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.UserRepresentation; @@ -32,7 +28,12 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.List; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapper2WaySyncTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapper2WaySyncTest.java index e7779234f00..0b909b16182 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapper2WaySyncTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapper2WaySyncTest.java @@ -17,12 +17,6 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; @@ -37,6 +31,13 @@ import org.keycloak.storage.user.SynchronizationResult; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperCustomMemberOfTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperCustomMemberOfTest.java index 8b576ced43e..fffc6443941 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperCustomMemberOfTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperCustomMemberOfTest.java @@ -17,10 +17,9 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.LDAPConstants; @@ -36,8 +35,10 @@ import org.keycloak.storage.user.SynchronizationResult; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; -import java.util.List; -import java.util.stream.Collectors; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; @@ -107,4 +108,3 @@ public class LDAPGroupMapperCustomMemberOfTest extends AbstractLDAPTest { }); } } - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncTest.java index 6153075939b..54a139c6d45 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncTest.java @@ -17,15 +17,13 @@ package org.keycloak.testsuite.federation.ldap; -import org.jboss.logging.Logger; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.Date; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.BadRequestException; + import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.LDAPConstants; @@ -49,11 +47,15 @@ import org.keycloak.storage.user.SynchronizationResult; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; -import jakarta.ws.rs.BadRequestException; -import java.util.Date; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.jboss.logging.Logger; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runners.MethodSorters; import static org.keycloak.testsuite.util.LDAPTestUtils.getGroupDescriptionLDAPAttrName; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncWithGroupsPathTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncWithGroupsPathTest.java index 82def01da14..fb0687d866b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncWithGroupsPathTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperSyncWithGroupsPathTest.java @@ -17,14 +17,10 @@ package org.keycloak.testsuite.federation.ldap; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.Response; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.LDAPConstants; @@ -44,7 +40,12 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; -import java.util.stream.Collectors; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class LDAPGroupMapperSyncWithGroupsPathTest extends AbstractLDAPTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperTest.java index 48e5607ec7a..e8697862bbf 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPGroupMapperTest.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import javax.naming.directory.SearchControls; + import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.LDAPConstants; @@ -46,16 +47,17 @@ import org.keycloak.storage.ldap.mappers.membership.group.GroupMapperConfig; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; -import javax.naming.directory.SearchControls; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +import static org.keycloak.testsuite.util.LDAPTestUtils.getGroupDescriptionLDAPAttrName; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; -import static org.keycloak.testsuite.util.LDAPTestUtils.getGroupDescriptionLDAPAttrName; /** * @author Marek Posolda @@ -1069,4 +1071,3 @@ public class LDAPGroupMapperTest extends AbstractLDAPTest { }); } } - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedAttributeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedAttributeTest.java index c7b550a1853..9f5a03e515d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedAttributeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedAttributeTest.java @@ -17,13 +17,6 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; -import org.junit.runners.MethodSorters; import org.keycloak.component.ComponentModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -36,6 +29,14 @@ import org.keycloak.testsuite.runonserver.RunOnServerException; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runners.MethodSorters; + @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class LDAPHardcodedAttributeTest extends AbstractLDAPTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedGroupMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedGroupMapperTest.java index be5875e6140..749a4a9a235 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedGroupMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedGroupMapperTest.java @@ -16,15 +16,16 @@ */ package org.keycloak.testsuite.federation.ldap; -import org.junit.ClassRule; -import org.junit.Test; +import java.io.Serializable; + import org.keycloak.models.GroupModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.testsuite.util.LDAPRule; -import java.io.Serializable; +import org.junit.ClassRule; +import org.junit.Test; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedRoleMapperTest.java index c0db20accc3..830486eae79 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPHardcodedRoleMapperTest.java @@ -16,14 +16,15 @@ */ package org.keycloak.testsuite.federation.ldap; -import org.junit.ClassRule; -import org.junit.Test; +import java.util.stream.Collectors; + import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.testsuite.util.LDAPRule; -import java.util.stream.Collectors; +import org.junit.ClassRule; +import org.junit.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPLegacyImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPLegacyImportTest.java index 79bbdfb0ce3..a2059b94fdb 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPLegacyImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPLegacyImportTest.java @@ -17,11 +17,8 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.List; + import org.keycloak.component.ComponentModel; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.RealmRepresentation; @@ -35,7 +32,11 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; -import java.util.List; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADFullNameTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADFullNameTest.java index 2cbb16cb797..6ed7cc3be07 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADFullNameTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADFullNameTest.java @@ -17,11 +17,8 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.concurrent.TimeUnit; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; @@ -38,7 +35,11 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; -import java.util.concurrent.TimeUnit; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; /** * Test for the MSAD setup with usernameAttribute=sAMAccountName, rdnAttribute=cn and fullNameMapper mapped to cn diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADMapperTest.java index 06970063a7a..f3d1837545f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMSADMapperTest.java @@ -19,14 +19,6 @@ package org.keycloak.testsuite.federation.ldap; import java.util.Collections; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; @@ -48,6 +40,15 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runners.MethodSorters; + import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMultipleAttributesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMultipleAttributesTest.java index 5e345ac84db..2a94c54d3e0 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMultipleAttributesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPMultipleAttributesTest.java @@ -17,11 +17,13 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.Arrays; +import java.util.Collection; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.models.ClientModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; @@ -38,12 +40,11 @@ import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.Arrays; -import java.util.Collection; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author Marek Posolda @@ -226,5 +227,3 @@ public class LDAPMultipleAttributesTest extends AbstractLDAPTest { } - - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java index 08aaec56b81..3b254141c02 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoCacheTest.java @@ -26,12 +26,6 @@ import java.util.stream.Collectors; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; @@ -54,12 +48,19 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.MailUtils; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runners.MethodSorters; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assume.assumeThat; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoMSADTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoMSADTest.java index 4b17afffb9f..d8f25476058 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoMSADTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPNoMSADTest.java @@ -17,11 +17,9 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.List; +import java.util.Objects; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; @@ -37,11 +35,14 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; -import java.util.List; -import java.util.Objects; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; -import static org.hamcrest.Matchers.equalToIgnoringCase; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalToIgnoringCase; /** * Test for special scenarios, which don't work on MSAD (eg. renaming user RDN to "sn=john2" ) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPPasswordModifyExtensionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPPasswordModifyExtensionTest.java index d908775b71d..6b60f9d0721 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPPasswordModifyExtensionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPPasswordModifyExtensionTest.java @@ -18,11 +18,6 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.component.ComponentModel; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; @@ -42,6 +37,12 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + /** * Test for the LDAPv3 Password modify extension (https://tools.ietf.org/html/rfc3062) * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersFullNameMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersFullNameMapperTest.java index bd7013ad644..3b209ea443a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersFullNameMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersFullNameMapperTest.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.federation.ldap; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.RealmModel; @@ -35,16 +36,16 @@ import org.keycloak.storage.ldap.mappers.UserAttributeLDAPStorageMapper; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java index 12eb39bbf02..7bc1afef6f4 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPProvidersIntegrationTest.java @@ -17,11 +17,18 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.stream.Collectors; +import javax.naming.AuthenticationException; +import javax.naming.directory.SearchControls; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.component.ComponentModel; @@ -72,18 +79,13 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import javax.naming.AuthenticationException; -import jakarta.ws.rs.core.Response; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; -import java.util.stream.Collectors; -import javax.naming.directory.SearchControls; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java index 9b3a5d4db6a..cf8180a0f0e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPReadOnlyTest.java @@ -18,15 +18,12 @@ package org.keycloak.testsuite.federation.ldap; +import java.util.Collections; import java.util.List; import java.util.Map; -import org.hamcrest.MatcherAssert; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; + +import jakarta.ws.rs.ClientErrorException; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticatorFactory; @@ -52,13 +49,16 @@ import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginConfigTotpPage; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; -import org.openqa.selenium.By; - import org.keycloak.testsuite.util.WaitUtils; -import jakarta.ws.rs.ClientErrorException; - -import java.util.Collections; +import org.hamcrest.MatcherAssert; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; +import org.openqa.selenium.By; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPRoleMapperTest.java index 7002493f097..2ab3d9e6e92 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPRoleMapperTest.java @@ -17,12 +17,7 @@ package org.keycloak.testsuite.federation.ldap; import java.util.stream.Collectors; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; + import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; @@ -33,6 +28,13 @@ import org.keycloak.storage.ldap.mappers.membership.role.RoleMapperConfig; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.nullValue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPRoleMappingsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPRoleMappingsTest.java index 6afc7529bba..3be015fd0eb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPRoleMappingsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPRoleMappingsTest.java @@ -17,11 +17,9 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; @@ -31,7 +29,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.ComponentRepresentation; -import org.keycloak.storage.managers.UserStorageSyncManager; import org.keycloak.storage.UserStoragePrivateUtil; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.storage.ldap.LDAPStorageProvider; @@ -39,12 +36,16 @@ import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.storage.ldap.mappers.membership.LDAPGroupMapperMode; import org.keycloak.storage.ldap.mappers.membership.role.RoleLDAPStorageMapper; import org.keycloak.storage.ldap.mappers.membership.role.RoleMapperConfig; +import org.keycloak.storage.managers.UserStorageSyncManager; import org.keycloak.storage.user.SynchronizationResult; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; -import java.util.Set; -import java.util.stream.Collectors; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSamlIdPInitiatedVaryingLetterCaseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSamlIdPInitiatedVaryingLetterCaseTest.java index 59319d1619c..5a2cde6c601 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSamlIdPInitiatedVaryingLetterCaseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSamlIdPInitiatedVaryingLetterCaseTest.java @@ -16,6 +16,12 @@ */ package org.keycloak.testsuite.federation.ldap; +import java.net.URI; +import java.util.UUID; + +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.authentication.authenticators.broker.IdpAutoLinkAuthenticatorFactory; import org.keycloak.authentication.authenticators.broker.IdpCreateUserIfUniqueAuthenticatorFactory; @@ -53,19 +59,18 @@ import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; + import com.google.common.collect.ImmutableMap; -import java.net.URI; -import java.util.UUID; -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriBuilderException; import org.junit.After; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_SAML_ALIAS; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_SAML_ALIAS; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSearchForUsersPaginationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSearchForUsersPaginationTest.java index b99278e81a3..4fe6e94f6d8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSearchForUsersPaginationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSearchForUsersPaginationTest.java @@ -24,19 +24,9 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.hasItems; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.not; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; -import org.keycloak.models.LDAPConstants; + import org.keycloak.models.KeycloakSession; +import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserProvider; @@ -49,6 +39,19 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.hasItems; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.not; + @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class LDAPSearchForUsersPaginationTest extends AbstractLDAPTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSpecialCharsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSpecialCharsTest.java index db1ebc0692f..61241f1e8bd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSpecialCharsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSpecialCharsTest.java @@ -17,11 +17,10 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.LDAPConstants; @@ -39,9 +38,11 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; import static org.keycloak.testsuite.util.LDAPTestUtils.getGroupDescriptionLDAPAttrName; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSyncTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSyncTest.java index b841519bf00..c642ca562e1 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSyncTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPSyncTest.java @@ -23,17 +23,14 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import jakarta.ws.rs.BadRequestException; + import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.LDAPConstants; -import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.RealmModel; +import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.UserProvider; import org.keycloak.models.cache.UserCache; @@ -41,10 +38,9 @@ import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.SynchronizationResultRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.storage.ldap.LDAPConfig; -import org.keycloak.storage.managers.UserStorageSyncManager; import org.keycloak.storage.UserStoragePrivateUtil; import org.keycloak.storage.UserStorageUtil; +import org.keycloak.storage.ldap.LDAPConfig; import org.keycloak.storage.ldap.LDAPStorageProvider; import org.keycloak.storage.ldap.LDAPStorageProviderFactory; import org.keycloak.storage.ldap.LDAPUtils; @@ -56,12 +52,17 @@ import org.keycloak.storage.ldap.mappers.membership.MembershipType; import org.keycloak.storage.ldap.mappers.membership.group.GroupLDAPStorageMapper; import org.keycloak.storage.ldap.mappers.membership.group.GroupLDAPStorageMapperFactory; import org.keycloak.storage.ldap.mappers.membership.group.GroupMapperConfig; +import org.keycloak.storage.managers.UserStorageSyncManager; import org.keycloak.storage.user.SynchronizationResult; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.WaitUtils; -import jakarta.ws.rs.BadRequestException; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPTestAsserts.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPTestAsserts.java index 895127c720d..d89a3f8fad1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPTestAsserts.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPTestAsserts.java @@ -17,9 +17,6 @@ package org.keycloak.testsuite.federation.ldap; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Assert; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -27,6 +24,10 @@ import org.keycloak.models.UserProvider; import org.keycloak.representations.idm.SynchronizationResultRepresentation; import org.keycloak.storage.user.SynchronizationResult; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; + /** * Common LDAP asserts * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java index f0bbd049ccb..b97e1e3fc20 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserLoginTest.java @@ -18,23 +18,22 @@ package org.keycloak.testsuite.federation.ldap; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.FixMethodOrder; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExternalResource; -import org.junit.runners.MethodSorters; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + import org.keycloak.events.Errors; import org.keycloak.events.EventType; import org.keycloak.models.LDAPConstants; -import org.keycloak.models.RealmModel; import org.keycloak.models.ModelException; +import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.storage.ldap.idm.model.LDAPObject; -import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.runonserver.RunOnServerException; @@ -42,15 +41,16 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPRule.LDAPConnectionParameters; import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; - -import java.util.HashMap; -import java.util.Map; -import java.util.List; - -import java.util.Objects; -import org.junit.Assume; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assume; +import org.junit.FixMethodOrder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExternalResource; +import org.junit.runners.MethodSorters; + /** * Test user logins utilizing various LDAP authentication methods and different LDAP connection encryption mechanisms. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserMultipleCredentialTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserMultipleCredentialTest.java index 4903de22480..b309167db22 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserMultipleCredentialTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserMultipleCredentialTest.java @@ -1,12 +1,8 @@ package org.keycloak.testsuite.federation.ldap; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.FixMethodOrder; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.Arrays; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; @@ -29,7 +25,12 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; -import java.util.Arrays; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runners.MethodSorters; /** * Test user login with multiple credential providers, both local and federated through LDAP. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserProfileTest.java index 156eabe9a23..f4cedaf9d40 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserProfileTest.java @@ -23,13 +23,6 @@ import java.io.IOException; import java.util.List; import java.util.Set; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; @@ -55,6 +48,14 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.userprofile.config.UPConfigUtils; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; import static org.keycloak.userprofile.UserProfileUtil.USER_METADATA_GROUP; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserPropertiesMappingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserPropertiesMappingTest.java index df53ce89c0c..053c10bf55b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserPropertiesMappingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPUserPropertiesMappingTest.java @@ -17,8 +17,6 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.ClassRule; -import org.junit.Test; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakContext; import org.keycloak.models.RealmModel; @@ -32,6 +30,9 @@ import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; +import org.junit.ClassRule; +import org.junit.Test; + public class LDAPUserPropertiesMappingTest extends AbstractLDAPTest { public static final String USER_EMAIL_VERIFIED_LDAP_ATTRIBUTE = "l"; @@ -109,4 +110,3 @@ public class LDAPUserPropertiesMappingTest extends AbstractLDAPTest { }); } } - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java index 7f89e471e65..85339537507 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LDAPVaultCredentialsTest.java @@ -1,11 +1,12 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.ClassRule; +import java.util.Map; + import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; -import java.util.Map; +import org.junit.ClassRule; import static org.keycloak.models.LDAPConstants.BIND_CREDENTIAL; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LdapUsernameAttributeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LdapUsernameAttributeTest.java index 8b52a1aed66..aa0ea7a2424 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LdapUsernameAttributeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/LdapUsernameAttributeTest.java @@ -17,11 +17,6 @@ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.models.ModelDuplicateException; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -30,6 +25,12 @@ import org.keycloak.storage.ldap.idm.model.LDAPObject; import org.keycloak.testsuite.runonserver.RunOnServerException; import org.keycloak.testsuite.util.LDAPRule; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + /** * * @author rmartinc diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/UserFederationLdapConnectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/UserFederationLdapConnectionTest.java index a74d057ee47..c24c6025f26 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/UserFederationLdapConnectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/UserFederationLdapConnectionTest.java @@ -20,22 +20,23 @@ package org.keycloak.testsuite.federation.ldap; import java.util.List; import java.util.Map; -import org.hamcrest.Matchers; -import org.junit.ClassRule; -import org.junit.Test; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; + import org.keycloak.models.LDAPConstants; import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.LDAPCapabilityRepresentation; import org.keycloak.representations.idm.TestLdapConnectionRepresentation; import org.keycloak.services.managers.LDAPServerCapabilitiesManager; import org.keycloak.storage.ldap.idm.store.ldap.extended.PasswordModifyRequest; +import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.arquillian.annotation.EnableVault; -import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.util.LDAPRule; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.core.Response; +import org.hamcrest.Matchers; +import org.junit.ClassRule; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/UserStorageGracefulDegradationLdapTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/UserStorageGracefulDegradationLdapTest.java index d28bdb22b35..742626d5125 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/UserStorageGracefulDegradationLdapTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/UserStorageGracefulDegradationLdapTest.java @@ -16,30 +16,31 @@ */ package org.keycloak.testsuite.federation.ldap; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Stream; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; +import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.storage.ldap.LDAPStorageProvider; +import org.keycloak.storage.ldap.idm.model.LDAPObject; +import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestConfiguration; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.UserBuilder; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.storage.ldap.LDAPStorageProvider; -import org.keycloak.storage.ldap.idm.model.LDAPObject; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Stream; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; /** * Test graceful degradation with real embedded LDAP server that gets unreachable. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPGroupMapperNoImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPGroupMapperNoImportTest.java index e09726aac4c..beef3be5775 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPGroupMapperNoImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPGroupMapperNoImportTest.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.federation.ldap.noimport; +import org.keycloak.testsuite.federation.ldap.LDAPGroupMapperTest; + import org.junit.FixMethodOrder; import org.junit.Ignore; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.keycloak.testsuite.federation.ldap.LDAPGroupMapperTest; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPMultipleAttributesNoImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPMultipleAttributesNoImportTest.java index 8c11ca5765a..a6b28b78694 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPMultipleAttributesNoImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPMultipleAttributesNoImportTest.java @@ -17,10 +17,6 @@ package org.keycloak.testsuite.federation.ldap.noimport; -import org.junit.Assert; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.storage.UserStoragePrivateUtil; @@ -29,6 +25,11 @@ import org.keycloak.testsuite.federation.ldap.LDAPMultipleAttributesTest; import org.keycloak.testsuite.federation.ldap.LDAPTestAsserts; import org.keycloak.testsuite.federation.ldap.LDAPTestContext; +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + /** * @author Marek Posolda */ @@ -59,5 +60,3 @@ public class LDAPMultipleAttributesNoImportTest extends LDAPMultipleAttributesTe } - - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java index 7128b9c1013..8000747f0dd 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPProvidersIntegrationNoImportTest.java @@ -17,22 +17,14 @@ package org.keycloak.testsuite.federation.ldap.noimport; -import static org.junit.Assert.fail; - import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; -import java.util.Map; -import org.junit.Assert; -import org.junit.Before; -import org.junit.FixMethodOrder; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.admin.client.resource.ComponentResource; import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.admin.client.resource.UserResource; @@ -60,6 +52,15 @@ import org.keycloak.testsuite.federation.ldap.LDAPTestContext; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; +import org.junit.Assert; +import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.runners.MethodSorters; + +import static org.junit.Assert.fail; + /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPRoleMappingsNoImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPRoleMappingsNoImportTest.java index 3749f72d099..4e987a324c5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPRoleMappingsNoImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPRoleMappingsNoImportTest.java @@ -17,11 +17,9 @@ package org.keycloak.testsuite.federation.ldap.noimport; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.component.ComponentModel; import org.keycloak.models.AccountRoles; import org.keycloak.models.ClientModel; @@ -42,8 +40,11 @@ import org.keycloak.testsuite.federation.ldap.LDAPTestContext; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; -import java.util.Set; -import java.util.stream.Collectors; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPSearchForUsersPaginationNoImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPSearchForUsersPaginationNoImportTest.java index d907be220ec..deb31586d16 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPSearchForUsersPaginationNoImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/ldap/noimport/LDAPSearchForUsersPaginationNoImportTest.java @@ -22,13 +22,9 @@ import java.util.HashMap; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.junit.Assert; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; -import org.keycloak.models.LDAPConstants; + import org.keycloak.models.KeycloakSession; +import org.keycloak.models.LDAPConstants; import org.keycloak.models.RealmModel; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.admin.ApiUtil; @@ -37,6 +33,13 @@ import org.keycloak.testsuite.federation.ldap.LDAPTestContext; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; import org.keycloak.testsuite.util.UserBuilder; + +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.hasSize; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/AbstractUserStorageDirtyDeletionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/AbstractUserStorageDirtyDeletionTest.java index dda1378bf5e..f47908ef26f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/AbstractUserStorageDirtyDeletionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/AbstractUserStorageDirtyDeletionTest.java @@ -1,8 +1,11 @@ package org.keycloak.testsuite.federation.storage; -import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + import org.keycloak.admin.client.resource.GroupResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.util.MultivaluedHashMap; @@ -18,16 +21,15 @@ import org.keycloak.testsuite.updaters.Creator; import org.keycloak.testsuite.util.GroupBuilder; import org.keycloak.testsuite.util.UserBuilder; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.IntStream; +import org.hamcrest.Matchers; +import org.junit.Before; +import org.junit.Test; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java index 9d65ea6ed32..038987c86b9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BackwardsCompatibilityUserStorageTest.java @@ -18,11 +18,15 @@ package org.keycloak.testsuite.federation.storage; -import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.http.impl.client.CloseableHttpClient; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Test; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.AuthenticationFlow; import org.keycloak.authentication.authenticators.browser.RecoveryAuthnCodesFormAuthenticatorFactory; @@ -56,19 +60,16 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginTotpPage; import org.keycloak.testsuite.pages.SetupRecoveryAuthnCodesPage; import org.keycloak.testsuite.util.FlowUtil; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.TestAppHelper; - -import jakarta.ws.rs.core.Response; import org.keycloak.testsuite.util.TokenUtil; -import org.openqa.selenium.WebDriver; +import org.keycloak.testsuite.util.oauth.OAuthClient; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.http.impl.client.CloseableHttpClient; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Test; +import org.openqa.selenium.WebDriver; import static org.wildfly.common.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java index 6ccab76938a..834d3884754 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/BrokenUserStorageTest.java @@ -16,12 +16,8 @@ */ package org.keycloak.testsuite.federation.storage; -import org.jboss.arquillian.container.test.api.ContainerController; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; +import java.util.List; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.component.ComponentModel; import org.keycloak.models.RealmModel; @@ -34,7 +30,12 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; -import java.util.List; +import org.jboss.arquillian.container.test.api.ContainerController; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; /** * KEYCLOAK-3903 and KEYCLOAK-3620 diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java index 0e0c9f0d09b..d6cc3871473 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ClientStorageTest.java @@ -17,11 +17,21 @@ package org.keycloak.testsuite.federation.storage; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Calendar; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; @@ -29,8 +39,8 @@ import org.keycloak.events.Details; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.RealmModel; +import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.cache.infinispan.ClientAdapter; import org.keycloak.representations.AccessToken; import org.keycloak.representations.RefreshToken; @@ -48,35 +58,29 @@ import org.keycloak.testsuite.federation.HardcodedClientStorageProviderFactory; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; +import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.TokenUtil; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.Form; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.Calendar; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import static java.util.Calendar.DAY_OF_WEEK; import static java.util.Calendar.HOUR_OF_DAY; import static java.util.Calendar.MINUTE; + +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import org.keycloak.testsuite.util.AdminClientUtil; /** * Test that clients can override auth flows diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java index 16704c4f742..69b0f062e74 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/ComponentExportImportTest.java @@ -1,8 +1,13 @@ package org.keycloak.testsuite.federation.storage; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import java.io.Closeable; +import java.io.File; +import java.util.HashSet; +import java.util.Properties; +import java.util.Set; + +import jakarta.ws.rs.NotFoundException; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.exportimport.ExportImportConfig; @@ -14,20 +19,17 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.storage.UserStorageProvider; import org.keycloak.testsuite.AbstractAuthTest; import org.keycloak.testsuite.admin.ApiUtil; - import org.keycloak.testsuite.client.KeycloakTestingClient; import org.keycloak.testsuite.federation.UserMapStorageFactory; import org.keycloak.testsuite.util.RealmBuilder; -import java.io.Closeable; -import jakarta.ws.rs.NotFoundException; -import java.io.File; -import java.util.HashSet; -import java.util.Properties; -import java.util.Set; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; import static org.junit.Assert.fail; -import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java index b3f1e1bbfee..99b1c51d4a6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/FederatedStorageExportImportTest.java @@ -16,10 +16,14 @@ */ package org.keycloak.testsuite.federation.storage; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import java.io.Closeable; +import java.io.File; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + +import jakarta.ws.rs.NotFoundException; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.credential.CredentialModel; @@ -39,12 +43,10 @@ import org.keycloak.services.managers.RealmManager; import org.keycloak.storage.UserStorageUtil; import org.keycloak.testsuite.AbstractAuthTest; -import java.io.Closeable; -import jakarta.ws.rs.NotFoundException; -import java.io.File; -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java index dcae65a4a7c..7ecb6f31b52 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/GroupStorageTest.java @@ -17,8 +17,12 @@ package org.keycloak.testsuite.federation.storage; -import org.junit.Before; -import org.junit.Test; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; @@ -32,16 +36,14 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.HardcodedGroupStorageProviderFactory; -import jakarta.ws.rs.core.Response; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.stream.Collectors; +import org.junit.Before; +import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.hasItem; import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; public class GroupStorageTest extends AbstractTestRealmKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java index 746d2a31eb4..678e5baf764 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/RoleStorageTest.java @@ -20,14 +20,9 @@ package org.keycloak.testsuite.federation.storage; import java.io.IOException; import java.net.URISyntaxException; import java.util.stream.Collectors; + import jakarta.ws.rs.core.Response; -import static org.hamcrest.Matchers.allOf; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.RealmModel; @@ -41,6 +36,15 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.HardcodedRoleStorageProviderFactory; +import org.junit.Before; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertNotNull; + public class RoleStorageTest extends AbstractTestRealmKeycloakTest { private String providerId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java index 6b75a9941e8..1ee7dfb7e96 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageFailureTest.java @@ -16,13 +16,12 @@ */ package org.keycloak.testsuite.federation.storage; -import org.jboss.arquillian.container.test.api.ContainerController; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.stream.Stream; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.constants.ServiceAccountConstants; @@ -53,11 +52,13 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.stream.Stream; +import org.jboss.arquillian.container.test.api.ContainerController; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; /** * @author Bill Burke diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageOTPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageOTPTest.java index 136bb903dc0..184a8c7f927 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageOTPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageOTPTest.java @@ -23,11 +23,6 @@ import java.net.URISyntaxException; import java.util.Collections; import java.util.List; - -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.events.Details; @@ -55,6 +50,11 @@ import org.keycloak.testsuite.pages.LoginTotpPage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.UserBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; import static org.keycloak.testsuite.federation.storage.UserStorageTest.addComponent; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageProvidersTestUtils.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageProvidersTestUtils.java index 928acdfb025..fd0deb1cb18 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageProvidersTestUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageProvidersTestUtils.java @@ -1,17 +1,18 @@ package org.keycloak.testsuite.federation.storage; -import org.jboss.logging.Logger; +import java.util.stream.Stream; + import org.keycloak.common.util.reflections.Types; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.ModelException; import org.keycloak.models.RealmModel; +import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderFactory; import org.keycloak.storage.UserStorageProviderModel; -import java.util.stream.Stream; +import org.jboss.logging.Logger; public class UserStorageProvidersTestUtils { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java index c14a59ef429..0d004890683 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/storage/UserStorageTest.java @@ -1,16 +1,25 @@ package org.keycloak.testsuite.federation.storage; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.RandomStringUtils; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.mail.internet.MimeMessage; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.admin.client.resource.UserResource; @@ -59,41 +68,24 @@ import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.TestCleanup; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.userprofile.DefaultAttributes; -import org.openqa.selenium.Cookie; -import jakarta.mail.internet.MimeMessage; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; -import java.io.File; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; +import org.openqa.selenium.Cookie; import static java.util.Calendar.DAY_OF_WEEK; import static java.util.Calendar.HOUR_OF_DAY; import static java.util.Calendar.MINUTE; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; + import static org.keycloak.models.UserModel.RequiredAction.UPDATE_PROFILE; import static org.keycloak.storage.UserStorageProviderModel.CACHE_POLICY; import static org.keycloak.storage.UserStorageProviderModel.EVICTION_DAY; @@ -102,9 +94,20 @@ import static org.keycloak.storage.UserStorageProviderModel.EVICTION_MINUTE; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; import static org.keycloak.storage.UserStorageProviderModel.MAX_LIFESPAN; import static org.keycloak.testsuite.actions.RequiredActionEmailVerificationTest.getEmailLink; - import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlDoesntStartWith; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * * @author tkyjovsk diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java index 0be94dc7789..1469220b427 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/federation/sync/SyncFederationTest.java @@ -17,27 +17,28 @@ package org.keycloak.testsuite.federation.sync; -import org.jboss.logging.Logger; -import org.junit.Assert; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.TimeUnit; + import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; -import org.keycloak.storage.managers.UserStorageSyncManager; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderModel; +import org.keycloak.storage.managers.UserStorageSyncManager; import org.keycloak.storage.user.SynchronizationResult; import org.keycloak.testsuite.AbstractAuthTest; import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.federation.DummyUserFederationProviderFactory; import org.keycloak.timer.TimerProvider; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.TimeUnit; +import org.jboss.logging.Logger; +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; /** * Test with Dummy providers diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AbstractFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AbstractFlowTest.java index dbf95011573..952638c93cf 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AbstractFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AbstractFlowTest.java @@ -17,9 +17,9 @@ package org.keycloak.testsuite.forms; -import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.representations.idm.AuthenticationFlowRepresentation; import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; /** * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AccountConsoleTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AccountConsoleTest.java index 7bc3bb27fc4..9a2f09581fa 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AccountConsoleTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AccountConsoleTest.java @@ -2,9 +2,6 @@ package org.keycloak.testsuite.forms; import java.net.URISyntaxException; -import org.apache.http.client.utils.URIBuilder; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Test; import org.keycloak.models.Constants; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; @@ -12,6 +9,10 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.WaitUtils; + +import org.apache.http.client.utils.URIBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Test; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.firefox.FirefoxDriver; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java index 356fa6d8bf6..801bc27fc50 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AllowDenyAuthenticatorTest.java @@ -1,13 +1,14 @@ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Rule; -import org.junit.Test; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.authentication.authenticators.access.AllowAccessAuthenticatorFactory; import org.keycloak.authentication.authenticators.access.DenyAccessAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; import org.keycloak.authentication.authenticators.conditional.ConditionalRoleAuthenticatorFactory; +import org.keycloak.authentication.authenticators.conditional.ConditionalUserAttributeValueFactory; import org.keycloak.authentication.authenticators.directgrant.ValidatePassword; import org.keycloak.authentication.authenticators.directgrant.ValidateUsername; import org.keycloak.events.Details; @@ -15,21 +16,22 @@ import org.keycloak.events.Errors; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.authentication.authenticators.conditional.ConditionalUserAttributeValueFactory; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginUsernameOnlyPage; import org.keycloak.testsuite.pages.PasswordPage; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.HashMap; -import java.util.Map; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.forms.BrowserFlowTest.revertFlows; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.keycloak.testsuite.forms.BrowserFlowTest.revertFlows; /** * @author Martin Bartos diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java index fbaa67e5f54..b3708dc572d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AltSubflowForCredentialResetTest.java @@ -18,11 +18,8 @@ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.List; + import org.keycloak.authentication.authenticators.resetcred.ResetCredentialChooseUser; import org.keycloak.authentication.authenticators.resetcred.ResetCredentialEmail; import org.keycloak.authentication.authenticators.resetcred.ResetPassword; @@ -41,10 +38,15 @@ import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.UserBuilder; -import java.util.List; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; /** * Tests setting up alternative reset credentials sub flow to prevent signing in after clicking "forgot password" diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticationFlowCallbackProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticationFlowCallbackProviderTest.java index b6b67358565..26dc162d5f0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticationFlowCallbackProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticationFlowCallbackProviderTest.java @@ -17,10 +17,6 @@ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.keycloak.authentication.authenticators.access.AllowAccessAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; import org.keycloak.authentication.authenticators.conditional.ConditionalLoaAuthenticator; @@ -34,6 +30,11 @@ import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.FlowUtil; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest.java index d07ed28ea6a..932fd05e850 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest.java @@ -17,11 +17,9 @@ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; import org.keycloak.events.Details; import org.keycloak.models.AuthenticationExecutionModel; @@ -37,10 +35,13 @@ import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.UIUtils; -import org.openqa.selenium.By; -import java.util.HashMap; -import java.util.Map; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.openqa.selenium.By; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest2.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest2.java index 4c73f0d6c02..be97d603200 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest2.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/AuthenticatorSubflowsTest2.java @@ -17,11 +17,9 @@ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; import org.keycloak.events.Details; import org.keycloak.models.AuthenticationExecutionModel; @@ -36,10 +34,13 @@ import org.keycloak.testsuite.authentication.PushButtonAuthenticatorFactory; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; -import org.openqa.selenium.By; -import java.util.HashMap; -import java.util.Map; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.openqa.selenium.By; /** * @author Tomohiro Nagai diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java index c80a4c1b35f..90ce766978b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserButtonsTest.java @@ -17,15 +17,11 @@ package org.keycloak.testsuite.forms; -import static org.junit.Assert.assertEquals; - import java.io.IOException; + import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.models.UserModel; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; @@ -47,6 +43,13 @@ import org.keycloak.testsuite.util.MailUtils; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.UserBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + /** * Test for browser back/forward/refresh buttons * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java index 064527a4894..34bd3982e81 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BrowserFlowTest.java @@ -1,11 +1,10 @@ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.function.Consumer; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticator; @@ -31,11 +30,11 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.RequiredActionProviderSimpleRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.AbstractAuthenticationTest; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.ActionURIUtils; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.AbstractAuthenticationTest; import org.keycloak.testsuite.auth.page.login.OneTimeCode; import org.keycloak.testsuite.authentication.SetUserAttributeAuthenticatorFactory; import org.keycloak.testsuite.broker.SocialLoginTest; @@ -45,25 +44,28 @@ import org.keycloak.testsuite.pages.LoginTotpPage; import org.keycloak.testsuite.pages.LoginUsernameOnlyPage; import org.keycloak.testsuite.pages.PasswordPage; import org.keycloak.testsuite.util.FlowUtil; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.URLUtils; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.function.Consumer; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GITHUB; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GITLAB; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GOOGLE; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + public class BrowserFlowTest extends AbstractChangeImportedUserPasswordsTest { private static final String INVALID_AUTH_CODE = "Invalid authenticator code."; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java index 4a99734621c..f3508e14b85 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/BruteForceTest.java @@ -16,14 +16,17 @@ */ package org.keycloak.testsuite.forms; +import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.BadRequestException; -import org.hamcrest.MatcherAssert; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.UsersResource; import org.keycloak.events.Details; import org.keycloak.events.Errors; @@ -51,25 +54,23 @@ import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.MailUtils; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.RealmRepUtil; import org.keycloak.testsuite.util.UserBuilder; - -import jakarta.mail.MessagingException; -import jakarta.mail.internet.MimeMessage; import org.keycloak.testsuite.util.WaitUtils; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.net.MalformedURLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import org.hamcrest.MatcherAssert; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ConditionalUserAttributeAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ConditionalUserAttributeAuthenticatorTest.java index e6f820bb4c2..79d32609b6e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ConditionalUserAttributeAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ConditionalUserAttributeAuthenticatorTest.java @@ -1,14 +1,15 @@ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.authentication.authenticators.access.AllowAccessAuthenticatorFactory; import org.keycloak.authentication.authenticators.access.DenyAccessAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; +import org.keycloak.authentication.authenticators.conditional.ConditionalUserAttributeValueFactory; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.models.AuthenticationExecutionModel; @@ -17,7 +18,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.authentication.authenticators.conditional.ConditionalUserAttributeValueFactory; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginUsernameOnlyPage; import org.keycloak.testsuite.pages.PasswordPage; @@ -27,13 +27,15 @@ import org.keycloak.testsuite.util.GroupBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.forms.BrowserFlowTest.revertFlows; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -import static org.keycloak.testsuite.forms.BrowserFlowTest.revertFlows; /** * @author Daniele Martinoli diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java index 2633a1791cc..7f12bb809b2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomFlowTest.java @@ -16,11 +16,12 @@ */ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.HashMap; +import java.util.Map; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.authentication.AuthenticationFlow; @@ -52,20 +53,21 @@ import org.keycloak.testsuite.updaters.Creator; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.ExecutionBuilder; import org.keycloak.testsuite.util.FlowBuilder; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.RealmRepUtil; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import jakarta.ws.rs.core.Response; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; -import java.util.HashMap; -import java.util.Map; - -import jakarta.ws.rs.core.Response.Status; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.util.Matchers.statusCodeIs; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; + /** * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomRegistrationFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomRegistrationFlowTest.java index 79b27383074..2290c17f4c1 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomRegistrationFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/CustomRegistrationFlowTest.java @@ -16,11 +16,6 @@ */ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.representations.idm.AuthenticationExecutionRepresentation; import org.keycloak.representations.idm.AuthenticationFlowRepresentation; @@ -35,6 +30,12 @@ import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.util.ExecutionBuilder; import org.keycloak.testsuite.util.FlowBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + /** * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/DirectGrantFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/DirectGrantFlowTest.java index c55ad5caf4e..87636dc9260 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/DirectGrantFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/DirectGrantFlowTest.java @@ -18,10 +18,8 @@ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Rule; -import org.junit.Test; +import java.util.List; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticatorFactory; import org.keycloak.authentication.authenticators.directgrant.ValidatePassword; @@ -30,15 +28,18 @@ import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.utils.DefaultAuthenticationFlows; import org.keycloak.representations.idm.AuthenticationFlowRepresentation; import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractAuthenticationTest; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.AbstractAuthenticationTest; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.openqa.selenium.WebDriver; -import java.util.List; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.Rule; +import org.junit.Test; +import org.openqa.selenium.WebDriver; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ErrorEventOnCustomRegistrationFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ErrorEventOnCustomRegistrationFlowTest.java index 12e7af5606c..649527bc7f9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ErrorEventOnCustomRegistrationFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ErrorEventOnCustomRegistrationFlowTest.java @@ -16,10 +16,6 @@ */ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.events.EventType; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.representations.idm.RealmRepresentation; @@ -27,6 +23,11 @@ import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.pages.LoginPasswordResetPage; import org.keycloak.testsuite.util.FlowUtil; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + public class ErrorEventOnCustomRegistrationFlowTest extends AbstractFlowTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java index 4ac3e998873..f6923e0f88f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/FlowOverrideTest.java @@ -17,11 +17,19 @@ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -50,19 +58,13 @@ import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.util.BasicAuthHelper; -import org.openqa.selenium.By; -import jakarta.persistence.EntityManager; -import jakarta.persistence.LockModeType; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.Form; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.openqa.selenium.By; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/HiddenProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/HiddenProviderTest.java index 8aa4a124a46..146ac39f8e0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/HiddenProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/HiddenProviderTest.java @@ -16,15 +16,16 @@ */ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.IdentityProviderBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Test; + public class HiddenProviderTest extends AbstractTestRealmKeycloakTest { @Page diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java index 534a9ffc8bb..41e5249a17c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LevelOfAssuranceFlowTest.java @@ -26,11 +26,7 @@ import java.util.Map; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; @@ -84,15 +80,22 @@ import org.keycloak.testsuite.pages.SetupRecoveryAuthnCodesPage; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.FlowUtil; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.RealmRepUtil; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.util.JsonSerialization; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.actions.AppInitiatedActionDeleteCredentialTest.getKcActionParamForDeleteCredential; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.actions.AppInitiatedActionDeleteCredentialTest.getKcActionParamForDeleteCredential; /** * Tests for Level Of Assurance conditions in authentication flow. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java index 258bb9ec9ff..509e489d852 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginHotpTest.java @@ -16,11 +16,8 @@ */ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.net.MalformedURLException; + import org.keycloak.events.Details; import org.keycloak.models.OTPPolicy; import org.keycloak.models.credential.OTPCredentialModel; @@ -37,7 +34,11 @@ import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.RealmRepUtil; import org.keycloak.testsuite.util.UserBuilder; -import java.net.MalformedURLException; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java index 684b6aeab33..9f5f6c90191 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTest.java @@ -21,16 +21,12 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.HashMap; import java.util.List; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.core.Form; import jakarta.ws.rs.core.Response; -import org.apache.commons.lang3.RandomStringUtils; -import org.hamcrest.MatcherAssert; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.UsersResource; @@ -67,33 +63,41 @@ import org.keycloak.testsuite.pages.LoginConfigTotpPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; +import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; import org.keycloak.testsuite.util.Matchers; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.TokenSignatureUtil; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.apache.commons.lang3.RandomStringUtils; +import org.hamcrest.MatcherAssert; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.Cookie; -import org.keycloak.testsuite.util.AccountHelper; import org.openqa.selenium.JavascriptExecutor; +import static org.keycloak.common.Profile.Feature.DYNAMIC_SCOPES; +import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; +import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; +import static org.keycloak.testsuite.util.oauth.OAuthClient.SERVER_ROOT; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.common.Profile.Feature.DYNAMIC_SCOPES; -import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; -import static org.keycloak.testsuite.util.oauth.OAuthClient.SERVER_ROOT; -import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java index 14de8bf2acc..9ef1003f8cb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/LoginTotpTest.java @@ -16,11 +16,16 @@ */ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.net.MalformedURLException; +import java.util.List; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.events.Details; @@ -43,20 +48,16 @@ import org.keycloak.testsuite.pages.LoginTotpPage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.GreenMailRule; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.RealmRepUtil; import org.keycloak.testsuite.util.UserBuilder; - -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.Form; -import jakarta.ws.rs.core.Response; +import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.List; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultiFactorAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultiFactorAuthenticationTest.java index 72f57fc75d0..8000f2fd9f6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultiFactorAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultiFactorAuthenticationTest.java @@ -20,12 +20,6 @@ package org.keycloak.testsuite.forms; import java.util.Arrays; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.authentication.AuthenticationFlow; import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; @@ -48,6 +42,13 @@ import org.keycloak.testsuite.pages.PasswordPage; import org.keycloak.testsuite.pages.SelectAuthenticatorPage; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.WebDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultipleTabsLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultipleTabsLoginTest.java index 5accc61f4bb..e0cb482e0ff 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultipleTabsLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/MultipleTabsLoginTest.java @@ -17,32 +17,15 @@ package org.keycloak.testsuite.forms; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.models.Constants.CLIENT_DATA; -import static org.keycloak.testsuite.AssertEvents.DEFAULT_REDIRECT_URI; -import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; -import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; - import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; +import java.nio.charset.StandardCharsets; import java.util.List; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import java.nio.charset.StandardCharsets; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.message.BasicNameValuePair; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.common.util.UriUtils; @@ -81,15 +64,35 @@ import org.keycloak.testsuite.util.BrowserTabUtil; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.WaitUtils; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.oauth.PkceGenerator; import org.keycloak.util.TokenUtil; + +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.message.BasicNameValuePair; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.htmlunit.HtmlUnitDriver; +import static org.keycloak.models.Constants.CLIENT_DATA; +import static org.keycloak.testsuite.AssertEvents.DEFAULT_REDIRECT_URI; +import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; +import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; + +import static org.hamcrest.MatcherAssert.assertThat; + /** * Tries to simulate testing with multiple browser tabs * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java index aabee839e16..0dc51c513f7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/PasswordHashingTest.java @@ -16,13 +16,22 @@ */ package org.keycloak.testsuite.forms; +import java.nio.charset.StandardCharsets; +import java.security.spec.KeySpec; +import java.time.Duration; +import java.util.Base64; +import java.util.List; +import java.util.UUID; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import javax.crypto.SecretKeyFactory; +import javax.crypto.spec.PBEKeySpec; + import jakarta.persistence.EntityManager; import jakarta.ws.rs.BadRequestException; -import org.bouncycastle.crypto.generators.Argon2BytesGenerator; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Test; + import org.keycloak.common.crypto.FipsMode; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.credential.CredentialModel; @@ -54,18 +63,11 @@ import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.DefaultPasswordHash; import org.keycloak.testsuite.util.UserBuilder; -import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.PBEKeySpec; -import java.nio.charset.StandardCharsets; -import java.security.spec.KeySpec; -import java.time.Duration; -import java.util.Base64; -import java.util.List; -import java.util.UUID; -import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.stream.IntStream; +import org.bouncycastle.crypto.generators.Argon2BytesGenerator; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Test; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RPInitiatedFrontChannelLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RPInitiatedFrontChannelLogoutTest.java index 98be34d55df..3633837529a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RPInitiatedFrontChannelLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RPInitiatedFrontChannelLogoutTest.java @@ -16,8 +16,6 @@ */ package org.keycloak.testsuite.forms; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.jose.jws.JWSInput; import org.keycloak.models.BrowserSecurityHeaders; @@ -31,6 +29,9 @@ import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.junit.Assert; +import org.junit.Test; + /** * * @author rmartinc diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java index 39b6609dc5d..9397a56013b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ReAuthenticationTest.java @@ -22,12 +22,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.hamcrest.Matcher; -import org.hamcrest.Matchers; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Test; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; @@ -53,14 +47,22 @@ import org.keycloak.testsuite.util.FederatedIdentityBuilder; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.hamcrest.Matcher; +import org.hamcrest.Matchers; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GITHUB; import static org.keycloak.testsuite.broker.SocialLoginTest.Provider.GOOGLE; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; + /** * Test for various scenarios with user re-authentication * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RecoveryAuthnCodesAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RecoveryAuthnCodesAuthenticatorTest.java index 5e286b3bf6d..d68ef4fb119 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RecoveryAuthnCodesAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RecoveryAuthnCodesAuthenticatorTest.java @@ -1,22 +1,16 @@ package org.keycloak.testsuite.forms; -import com.fasterxml.jackson.core.type.TypeReference; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.FixMethodOrder; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.AuthenticationFlow; -import org.keycloak.authentication.authenticators.browser.RecoveryAuthnCodesFormAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; +import org.keycloak.authentication.authenticators.browser.RecoveryAuthnCodesFormAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; import org.keycloak.common.util.Time; import org.keycloak.credential.CredentialModel; @@ -53,22 +47,30 @@ import org.keycloak.testsuite.pages.PasswordPage; import org.keycloak.testsuite.pages.SelectAuthenticatorPage; import org.keycloak.testsuite.pages.SetupRecoveryAuthnCodesPage; import org.keycloak.testsuite.util.FlowUtil; +import org.keycloak.testsuite.util.SecondBrowser; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.SecondBrowser; import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runners.MethodSorters; import org.openqa.selenium.WebDriver; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import static org.keycloak.authentication.requiredactions.RecoveryAuthnCodesAction.WARNING_THRESHOLD; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; -import static org.keycloak.authentication.requiredactions.RecoveryAuthnCodesAction.WARNING_THRESHOLD; /** * Backup Code Authentication test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java index 8a6af11c63f..8df6d67c13c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterTest.java @@ -16,11 +16,14 @@ */ package org.keycloak.testsuite.forms; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import jakarta.mail.internet.MimeMessage; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.AuthenticationFlow; import org.keycloak.authentication.authenticators.browser.CookieAuthenticatorFactory; import org.keycloak.authentication.forms.RegistrationPassword; @@ -50,27 +53,25 @@ import org.keycloak.testsuite.pages.LoginPasswordResetPage; import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.pages.VerifyEmailPage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; +import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.MailUtils; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.UserBuilder; -import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.UIUtils; +import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import jakarta.mail.internet.MimeMessage; -import jakarta.ws.rs.core.Response; - -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java index e6b4243d0bc..827211e7552 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RegisterWithUserProfileTest.java @@ -16,32 +16,10 @@ */ package org.keycloak.testsuite.forms; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.anyOf; -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_ONLY; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ALL; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_EDITABLE; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.SCOPE_DEPARTMENT; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.VALIDATIONS_LENGTH; -import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.ATTRIBUTE_DEPARTMENT; - import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.commons.lang3.StringUtils; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; @@ -56,10 +34,33 @@ import org.keycloak.testsuite.util.ClientScopeBuilder; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.KeycloakModelUtils; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; + +import org.apache.commons.lang3.StringUtils; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.ATTRIBUTE_DEPARTMENT; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_EDITABLE; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_ONLY; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ALL; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.SCOPE_DEPARTMENT; +import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.VALIDATIONS_LENGTH; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * Test user registration with customized user-profile configurations * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java index eb2bcb823cb..140520d1346 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetCredentialsAlternativeFlowsTest.java @@ -18,11 +18,11 @@ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.Arrays; +import java.util.List; + +import jakarta.mail.internet.MimeMessage; + import org.keycloak.models.UserManager; import org.keycloak.models.UserModel; import org.keycloak.models.utils.DefaultAuthenticationFlows; @@ -31,9 +31,9 @@ import org.keycloak.representations.idm.AuthenticationFlowRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.AbstractAuthenticationTest; import org.keycloak.testsuite.actions.AbstractAppInitiatedActionTest; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.AbstractAuthenticationTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginConfigTotpPage; @@ -51,12 +51,13 @@ import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.MailUtils; import org.keycloak.testsuite.util.URLUtils; import org.keycloak.testsuite.util.UserBuilder; - -import jakarta.mail.internet.MimeMessage; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.Arrays; -import java.util.List; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetOtpTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetOtpTest.java index bd197cca2f9..53511535c02 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetOtpTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetOtpTest.java @@ -1,10 +1,8 @@ package org.keycloak.testsuite.forms; -import static org.wildfly.common.Assert.assertTrue; +import java.util.Map; +import java.util.stream.Collectors; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Test; import org.keycloak.admin.client.CreatedResponseUtil; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.AuthenticationExecutionModel; @@ -21,8 +19,11 @@ import org.keycloak.testsuite.pages.ResetOtpPage; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; -import java.util.Map; -import java.util.stream.Collectors; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Test; + +import static org.wildfly.common.Assert.assertTrue; public class ResetOtpTest extends AbstractTestRealmKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java index 6855ed33110..2d0c6575648 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ResetPasswordTest.java @@ -16,17 +16,23 @@ */ package org.keycloak.testsuite.forms; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.drone.api.annotation.Drone; +import java.io.Closeable; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.actiontoken.resetcred.ResetCredentialsActionToken; import org.keycloak.authentication.authenticators.resetcred.ResetCredentialEmail; -import org.jboss.arquillian.graphene.page.Page; import org.keycloak.common.constants.ServiceAccountConstants; -import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.KeycloakUriBuilder; +import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.events.Details; import org.keycloak.events.Errors; import org.keycloak.events.EventType; @@ -46,8 +52,8 @@ import org.keycloak.services.resources.LoginActionsService; import org.keycloak.storage.StorageId; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderModel; -import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; +import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.federation.UserMapStorageFactory; @@ -62,32 +68,26 @@ import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.pages.LogoutConfirmPage; import org.keycloak.testsuite.pages.VerifyEmailPage; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; +import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.BrowserTabUtil; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; import org.keycloak.testsuite.util.KerberosUtils; import org.keycloak.testsuite.util.MailUtils; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.SecondBrowser; +import org.keycloak.testsuite.util.TestAppHelper; import org.keycloak.testsuite.util.UIUtils; import org.keycloak.testsuite.util.URLUtils; import org.keycloak.testsuite.util.UserActionTokenBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.WaitUtils; -import org.keycloak.testsuite.util.AccountHelper; -import org.keycloak.testsuite.util.TestAppHelper; - -import jakarta.mail.MessagingException; -import jakarta.mail.internet.MimeMessage; - -import java.io.Closeable; -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; import org.junit.Assert; import org.junit.Before; import org.junit.Rule; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RestartCookieTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RestartCookieTest.java index 629280767fb..046d56c4f0e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RestartCookieTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/RestartCookieTest.java @@ -17,16 +17,14 @@ package org.keycloak.testsuite.forms; -import jakarta.ws.rs.core.Response; - import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.HashSet; import java.util.Set; +import javax.crypto.SecretKey; + +import jakarta.ws.rs.core.Response; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.TokenCategory; import org.keycloak.common.util.MultivaluedHashMap; @@ -54,9 +52,11 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.oauth.ParResponse; import org.keycloak.util.TokenUtil; -import org.openqa.selenium.Cookie; -import javax.crypto.SecretKey; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Rule; +import org.junit.Test; +import org.openqa.selenium.Cookie; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/SSOTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/SSOTest.java index 86a39353c31..c4e2289b99e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/SSOTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/SSOTest.java @@ -16,12 +16,10 @@ */ package org.keycloak.testsuite.forms; -import org.apache.http.impl.client.CloseableHttpClient; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; + +import jakarta.ws.rs.core.Response; + import org.keycloak.events.Details; import org.keycloak.events.EventType; import org.keycloak.models.UserModel; @@ -39,15 +37,19 @@ import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; import org.keycloak.testsuite.util.MutualTLSUtils; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.apache.http.impl.client.CloseableHttpClient; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.WebDriver; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; -import java.io.IOException; -import jakarta.ws.rs.core.Response; - /** * @author Stian Thorgersen * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ScriptAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ScriptAuthenticatorTest.java index 67b5a7b5473..2edb45edbdb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ScriptAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ScriptAuthenticatorTest.java @@ -16,12 +16,10 @@ */ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; +import java.util.UUID; + +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; import org.keycloak.common.Profile; import org.keycloak.events.Details; @@ -41,9 +39,12 @@ import org.keycloak.testsuite.util.FlowBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; -import jakarta.ws.rs.core.Response; - -import java.util.UUID; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; import static org.keycloak.common.Profile.Feature.AUTHORIZATION; @@ -202,4 +203,3 @@ public class ScriptAuthenticatorTest extends AbstractFlowTest { events.expectLogin().user(userId).detail(Details.USERNAME, "user").assertEvent(); } } - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ThemeSelectorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ThemeSelectorTest.java index 8994a968123..aaf286c0821 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ThemeSelectorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/ThemeSelectorTest.java @@ -1,13 +1,14 @@ package org.keycloak.testsuite.forms; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Test; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.pages.LoginPage; - import org.keycloak.theme.ThemeSelectorProvider; + +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Test; + import static org.junit.Assert.assertEquals; public class ThemeSelectorTest extends AbstractTestRealmKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/TransientSessionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/TransientSessionTest.java index 2012ac50bca..cccfb632b40 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/TransientSessionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/TransientSessionTest.java @@ -18,8 +18,6 @@ package org.keycloak.testsuite.forms; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.models.UserSessionModel; import org.keycloak.models.utils.DefaultAuthenticationFlows; import org.keycloak.representations.AccessToken; @@ -31,9 +29,13 @@ import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUIRED; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUIRED; /** * Test for transient user session diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java index ef1a771f4eb..90524ad9422 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/forms/VerifyProfileTest.java @@ -16,12 +16,12 @@ */ package org.keycloak.testsuite.forms; -import org.apache.commons.lang3.StringUtils; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.UUID; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.events.Details; import org.keycloak.events.EventType; @@ -53,20 +53,16 @@ import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; import org.keycloak.userprofile.UserProfileContext; import org.keycloak.util.JsonSerialization; + +import org.apache.commons.lang3.StringUtils; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.arquillian.test.api.ArquillianResource; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.ATTRIBUTE_DEPARTMENT; import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.CONFIGURATION_FOR_USER_EDIT; import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSIONS_ADMIN_EDITABLE; @@ -75,6 +71,12 @@ import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.PERMISSION import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.SCOPE_DEPARTMENT; import static org.keycloak.testsuite.util.userprofile.UserProfileUtil.VALIDATIONS_LENGTH; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + /** * @author Vlastimil Elias */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AbstractI18NTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AbstractI18NTest.java index c29dc502147..3d4414f2276 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AbstractI18NTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/AbstractI18NTest.java @@ -17,12 +17,13 @@ package org.keycloak.testsuite.i18n; -import org.junit.After; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.After; + /** * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java index 30d201b81bb..94e4010f06f 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/EmailTest.java @@ -16,15 +16,6 @@ */ package org.keycloak.testsuite.i18n; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.junit.Assert.assertEquals; - -import jakarta.mail.MessagingException; -import jakarta.mail.internet.MimeMessage; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -34,18 +25,10 @@ import java.util.Locale; import java.util.Set; import java.util.stream.Collectors; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.core.HttpHeaders; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.message.BasicNameValuePair; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.http.simple.SimpleHttpResponse; import org.keycloak.models.UserModel; @@ -60,9 +43,28 @@ import org.keycloak.testsuite.util.DroneUtils; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.MailUtils; import org.keycloak.testsuite.util.WaitUtils; + +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.message.BasicNameValuePair; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.Cookie; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertEquals; + /** * @author Michael Gerber * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/LoginPageTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/LoginPageTest.java index 440553972fa..afb8c42155c 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/LoginPageTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/LoginPageTest.java @@ -16,17 +16,14 @@ */ package org.keycloak.testsuite.i18n; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.Locale; + import jakarta.ws.rs.core.Response; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.resteasy.client.jaxrs.ResteasyClient; -import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; -import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.cookie.CookieType; @@ -54,13 +51,18 @@ import org.keycloak.testsuite.updaters.UserAttributeUpdater; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.IdentityProviderBuilder; import org.keycloak.testsuite.util.UIUtils; -import org.openqa.selenium.Cookie; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Arrays; -import java.util.Locale; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.resteasy.client.jaxrs.ResteasyClient; +import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; +import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient43Engine; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.openqa.selenium.Cookie; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/RealmLocalizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/RealmLocalizationTest.java index 78d8bf07bb9..eb3e6c978b9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/RealmLocalizationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/i18n/RealmLocalizationTest.java @@ -1,9 +1,10 @@ package org.keycloak.testsuite.i18n; -import org.junit.Test; +import java.util.Map; + import org.keycloak.admin.client.resource.RealmLocalizationResource; -import java.util.Map; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasEntry; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/ConditionalCredentialAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/ConditionalCredentialAuthenticatorTest.java index 45c59e83d23..f6f053cc480 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/ConditionalCredentialAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/ConditionalCredentialAuthenticatorTest.java @@ -19,10 +19,7 @@ package org.keycloak.testsuite.login; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.authenticators.conditional.ConditionalCredentialAuthenticatorFactory; @@ -41,6 +38,11 @@ import org.keycloak.testsuite.auth.page.login.OneTimeCode; import org.keycloak.testsuite.pages.LoginTotpPage; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; + /** * * @author rmartinc diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/ConditionalSubFlowExecutedAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/ConditionalSubFlowExecutedAuthenticatorTest.java index cfa08f00efa..f78877e3fdc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/ConditionalSubFlowExecutedAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/ConditionalSubFlowExecutedAuthenticatorTest.java @@ -17,10 +17,7 @@ package org.keycloak.testsuite.login; import java.util.Map; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.authenticators.access.DenyAccessAuthenticatorFactory; @@ -41,6 +38,11 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginTotpPage; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; + /** *

Test for the ConditionalSubFlowExecutedAuthenticator. A test parent * flow is created to substitute the original browser flow. This flow diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/LoginTimeoutValidationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/LoginTimeoutValidationTest.java index ddcc066cd96..6cc2582bda1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/LoginTimeoutValidationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/login/LoginTimeoutValidationTest.java @@ -17,10 +17,6 @@ package org.keycloak.testsuite.login; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -33,6 +29,11 @@ import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + public class LoginTimeoutValidationTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/metrics/MetricsRestServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/metrics/MetricsRestServiceTest.java index 7fb149fce86..339441cc159 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/metrics/MetricsRestServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/metrics/MetricsRestServiceTest.java @@ -17,22 +17,25 @@ package org.keycloak.testsuite.metrics; import java.util.List; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.junit.BeforeClass; -import org.junit.Test; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ContainerAssume; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; +import org.junit.BeforeClass; +import org.junit.Test; + import static org.keycloak.testsuite.util.Matchers.body; import static org.keycloak.testsuite.util.Matchers.statusCodeIs; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + public class MetricsRestServiceTest extends AbstractKeycloakTest { private static final String MGMT_PORT = System.getProperty("auth.server.management.port", "10090"); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractJsonFileImportMigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractJsonFileImportMigrationTest.java index 386bb1529cd..616a2d6f31d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractJsonFileImportMigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractJsonFileImportMigrationTest.java @@ -16,15 +16,16 @@ */ package org.keycloak.testsuite.migration; +import org.keycloak.representations.idm.RealmRepresentation; + +import org.junit.Before; + +import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; -import org.junit.Before; -import org.keycloak.representations.idm.RealmRepresentation; - -import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java index 33663e45315..b3a58e03119 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/AbstractMigrationTest.java @@ -16,10 +16,21 @@ */ package org.keycloak.testsuite.migration; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.xml.security.encryption.XMLCipher; -import org.hamcrest.Matchers; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.Objects; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -84,20 +95,19 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.theme.DefaultThemeSelectorProvider; import org.keycloak.util.TokenUtil; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; -import java.util.Objects; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.stream.Collectors; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.xml.security.encryption.XMLCipher; +import org.hamcrest.Matchers; + +import static org.keycloak.migration.migrators.MigrateTo24_0_0.REALM_USER_PROFILE_ENABLED; +import static org.keycloak.models.AccountRoles.MANAGE_ACCOUNT; +import static org.keycloak.models.AccountRoles.MANAGE_ACCOUNT_LINKS; +import static org.keycloak.models.AccountRoles.VIEW_GROUPS; +import static org.keycloak.models.Constants.ACCOUNT_MANAGEMENT_CLIENT_ID; +import static org.keycloak.testsuite.Assert.assertNames; +import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; +import static org.keycloak.userprofile.DeclarativeUserProfileProvider.UP_COMPONENT_CONFIG_KEY; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; @@ -117,14 +127,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.migration.migrators.MigrateTo24_0_0.REALM_USER_PROFILE_ENABLED; -import static org.keycloak.models.AccountRoles.MANAGE_ACCOUNT; -import static org.keycloak.models.AccountRoles.MANAGE_ACCOUNT_LINKS; -import static org.keycloak.models.AccountRoles.VIEW_GROUPS; -import static org.keycloak.models.Constants.ACCOUNT_MANAGEMENT_CLIENT_ID; -import static org.keycloak.testsuite.Assert.assertNames; -import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; -import static org.keycloak.userprofile.DeclarativeUserProfileProvider.UP_COMPONENT_CONFIG_KEY; /** * @author Bill Burke diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java index 6016fc2a7a2..9a7a6bcf30d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1301MigrationClientPoliciesTest.java @@ -22,7 +22,6 @@ import java.io.IOException; import java.util.List; import java.util.Map; -import org.junit.Test; import org.keycloak.exportimport.util.ImportUtils; import org.keycloak.representations.idm.ClientPoliciesRepresentation; import org.keycloak.representations.idm.ClientProfilesRepresentation; @@ -31,6 +30,8 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.utils.io.IOUtil; import org.keycloak.util.JsonSerialization; +import org.junit.Test; + /** * This is test only for migration of client policies from Keycloak 13. As the format JSON format of client policies changed between Keycloak 13 and 14 * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1903MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1903MigrationTest.java index 4b8e30c7c14..448056d10cb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1903MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport1903MigrationTest.java @@ -16,7 +16,11 @@ */ package org.keycloak.testsuite.migration; -import org.junit.Test; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; + import org.keycloak.OAuth2Constants; import org.keycloak.exportimport.util.ImportUtils; import org.keycloak.representations.idm.ComponentRepresentation; @@ -27,16 +31,14 @@ import org.keycloak.testsuite.utils.io.IOUtil; import org.keycloak.userprofile.config.UPConfigUtils; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Set; +import org.junit.Test; + +import static org.keycloak.userprofile.DeclarativeUserProfileProvider.UP_COMPONENT_CONFIG_KEY; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertEquals; -import static org.keycloak.userprofile.DeclarativeUserProfileProvider.UP_COMPONENT_CONFIG_KEY; /** * Tests that we can import json file from previous version. MigrationTest only tests DB. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java index 36bc37348b0..5c94767c4d5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport198MigrationTest.java @@ -16,17 +16,18 @@ */ package org.keycloak.testsuite.migration; -import org.junit.BeforeClass; -import org.junit.Test; +import java.io.IOException; +import java.util.List; +import java.util.Map; + import org.keycloak.exportimport.util.ImportUtils; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.util.KerberosUtils; import org.keycloak.testsuite.utils.io.IOUtil; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.List; -import java.util.Map; +import org.junit.BeforeClass; +import org.junit.Test; /** * Tests that we can import json file from previous version. MigrationTest only tests DB. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java index 47c7cde4bbc..5ae7a002b12 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport255MigrationTest.java @@ -16,17 +16,18 @@ */ package org.keycloak.testsuite.migration; -import org.junit.Test; -import org.keycloak.exportimport.util.ImportUtils; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.utils.io.IOUtil; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.util.List; import java.util.Map; + import org.keycloak.common.Profile; +import org.keycloak.exportimport.util.ImportUtils; +import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.ProfileAssume; +import org.keycloak.testsuite.utils.io.IOUtil; +import org.keycloak.util.JsonSerialization; + +import org.junit.Test; /** * Tests that we can import json file from previous version. MigrationTest only tests DB. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java index aac7aba6c0d..151ee9d6a22 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport343MigrationTest.java @@ -16,17 +16,18 @@ */ package org.keycloak.testsuite.migration; -import org.junit.Test; -import org.keycloak.common.Profile; -import org.keycloak.exportimport.util.ImportUtils; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.utils.io.IOUtil; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.util.List; import java.util.Map; + +import org.keycloak.common.Profile; +import org.keycloak.exportimport.util.ImportUtils; +import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.ProfileAssume; +import org.keycloak.testsuite.utils.io.IOUtil; +import org.keycloak.util.JsonSerialization; + +import org.junit.Test; /** * Tests that we can import json file from previous version. MigrationTest only tests DB. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java index d3627174cd9..59ea46f2c9a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport483MigrationTest.java @@ -16,17 +16,18 @@ */ package org.keycloak.testsuite.migration; -import org.junit.Test; -import org.keycloak.common.Profile; -import org.keycloak.exportimport.util.ImportUtils; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.utils.io.IOUtil; -import org.keycloak.util.JsonSerialization; - import java.io.IOException; import java.util.List; import java.util.Map; + +import org.keycloak.common.Profile; +import org.keycloak.exportimport.util.ImportUtils; +import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.ProfileAssume; +import org.keycloak.testsuite.utils.io.IOUtil; +import org.keycloak.util.JsonSerialization; + +import org.junit.Test; /** * Tests that we can import json file from previous version. MigrationTest only tests DB. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport903MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport903MigrationTest.java index 163688d828d..e23da33644b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport903MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/JsonFileImport903MigrationTest.java @@ -16,15 +16,16 @@ */ package org.keycloak.testsuite.migration; -import org.junit.Test; +import java.io.IOException; +import java.util.List; +import java.util.Map; + import org.keycloak.exportimport.util.ImportUtils; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.utils.io.IOUtil; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.List; -import java.util.Map; +import org.junit.Test; /** * Tests that we can import json file from previous version. MigrationTest only tests DB. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationDeniedTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationDeniedTest.java index 132f8e3b5ab..ccb41268b57 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationDeniedTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationDeniedTest.java @@ -21,8 +21,6 @@ package org.keycloak.testsuite.migration; import java.util.List; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.common.Version; import org.keycloak.migration.MigrationModel; import org.keycloak.models.Constants; @@ -35,6 +33,9 @@ import org.keycloak.storage.datastore.DefaultMigrationManager; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; +import org.junit.Assert; +import org.junit.Test; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java index b186a1b4b47..32e71edceea 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/migration/MigrationTest.java @@ -16,14 +16,16 @@ */ package org.keycloak.testsuite.migration; -import org.junit.Before; -import org.junit.Test; +import java.util.List; + +import jakarta.ws.rs.NotFoundException; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.arquillian.migration.Migration; -import jakarta.ws.rs.NotFoundException; -import java.util.List; +import org.junit.Before; +import org.junit.Test; import static org.keycloak.testsuite.auth.page.AuthRealm.MASTER; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java index 93fa94b4fde..ea27933c32b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/AuthenticationSessionProviderTest.java @@ -19,10 +19,6 @@ package org.keycloak.testsuite.model; import java.util.concurrent.atomic.AtomicReference; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.common.util.Time; import org.keycloak.infinispan.util.InfinispanUtils; import org.keycloak.models.ClientModel; @@ -43,6 +39,11 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNull.notNullValue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/BadRealmTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/BadRealmTest.java index 76b1f963b47..c6d40b78d3d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/BadRealmTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/BadRealmTest.java @@ -1,6 +1,7 @@ package org.keycloak.testsuite.model; -import org.junit.Test; +import java.util.List; + import org.keycloak.models.KeycloakSession; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.managers.RealmManager; @@ -8,7 +9,7 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.utils.ReservedCharValidator; -import java.util.List; +import org.junit.Test; import static org.junit.Assert.fail; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CacheTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CacheTest.java index 85daa681836..df5134e35a1 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CacheTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CacheTest.java @@ -17,7 +17,10 @@ package org.keycloak.testsuite.model; -import org.junit.Test; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + import org.keycloak.models.ClientModel; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; @@ -25,18 +28,15 @@ import org.keycloak.models.UserModel; import org.keycloak.models.UserSessionModel; import org.keycloak.models.cache.infinispan.ClientAdapter; import org.keycloak.models.cache.infinispan.RealmAdapter; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; +import org.keycloak.testsuite.Assert; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; +import org.junit.Test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.Assert; -import org.keycloak.representations.idm.RealmRepresentation; - /** * @author Bill Burke * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java index a3b62c47fdb..a0327cecef2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ClientModelTest.java @@ -17,7 +17,10 @@ */ package org.keycloak.testsuite.model; -import org.junit.Test; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; + import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.KeycloakSession; @@ -34,9 +37,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java index b883c5ad47c..40a605d594d 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CompositeRolesModelTest.java @@ -17,10 +17,11 @@ package org.keycloak.testsuite.model; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -31,10 +32,10 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; -import java.util.HashSet; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java index a1b58336b8a..581c4d3e2c3 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ConcurrentTransactionsTest.java @@ -17,14 +17,18 @@ package org.keycloak.testsuite.model; -import org.jboss.logging.Logger; -import org.junit.Assert; -import org.junit.Test; +import java.util.Arrays; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; + import org.keycloak.models.ClientModel; import org.keycloak.models.ClientProvider; +import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.RealmModel; +import org.keycloak.models.RoleModel; import org.keycloak.models.UserManager; import org.keycloak.models.UserModel; import org.keycloak.models.utils.KeycloakModelUtils; @@ -32,16 +36,13 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; -import java.util.Arrays; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; +import org.jboss.logging.Logger; +import org.junit.Assert; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.MatcherAssert.assertThat; - -import org.keycloak.models.Constants; -import org.keycloak.models.RoleModel; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CredentialModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CredentialModelTest.java index 91fdc1782fb..6efeebb5392 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CredentialModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/CredentialModelTest.java @@ -1,7 +1,11 @@ package org.keycloak.testsuite.model; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + import jakarta.persistence.EntityManager; -import org.junit.Test; + import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.credential.CredentialModel; import org.keycloak.models.KeycloakSession; @@ -15,9 +19,7 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.arquillian.annotation.ModelTest; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; +import org.junit.Test; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ImportTest.java index 815cd51a2c4..d51d18f3d4a 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ImportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/ImportTest.java @@ -17,11 +17,15 @@ package org.keycloak.testsuite.model; -import org.apache.commons.io.IOUtils; -import org.junit.Assert; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Collection; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.common.Profile; @@ -34,24 +38,21 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.protocol.oidc.utils.AcrUtils; import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.representations.userprofile.config.UPAttribute; +import org.keycloak.representations.userprofile.config.UPAttributeSelector; +import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.runonserver.RunOnServerException; import org.keycloak.userprofile.UserProfileProvider; -import org.keycloak.representations.userprofile.config.UPAttribute; -import org.keycloak.representations.userprofile.config.UPAttributeSelector; -import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Collection; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; +import org.apache.commons.io.IOUtils; +import org.junit.Assert; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java index 5951a52f252..23178ba1bf6 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/MultipleRealmsTest.java @@ -17,9 +17,15 @@ package org.keycloak.testsuite.model; -import org.junit.Assert; -import org.junit.Test; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; +import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleModel; @@ -31,13 +37,9 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; -import java.util.concurrent.atomic.AtomicReference; -import org.keycloak.models.Constants; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.junit.Assert; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.is; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/OwnerReplacementTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/OwnerReplacementTest.java index ddfd9b3b259..63ae026692d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/OwnerReplacementTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/OwnerReplacementTest.java @@ -22,9 +22,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; import java.util.function.BiFunction; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import org.keycloak.component.ComponentModel; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; @@ -48,6 +45,10 @@ import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import static org.keycloak.testsuite.AbstractAdminTest.loadJson; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SimpleModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SimpleModelTest.java index d40aabb3bd9..5bfdf48d2ea 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SimpleModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SimpleModelTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.model; -import org.junit.Assert; -import org.junit.Test; +import java.util.List; + +import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; @@ -28,8 +29,8 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.runonserver.RunOnServerException; -import java.util.List; -import org.keycloak.models.Constants; +import org.junit.Assert; +import org.junit.Test; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SingleUseProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SingleUseProviderTest.java index bd956a317dd..cb05da3f1d0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SingleUseProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/SingleUseProviderTest.java @@ -26,8 +26,6 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.models.KeycloakSession; import org.keycloak.models.SingleUseObjectProvider; import org.keycloak.models.utils.KeycloakModelUtils; @@ -35,6 +33,9 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; +import org.junit.Assert; +import org.junit.Test; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java index 790a15528bc..d6f5f62b52b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentModelTest.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.model; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; @@ -39,9 +39,11 @@ import org.keycloak.storage.client.ClientStorageProviderModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.federation.HardcodedClientStorageProviderFactory; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java index 961d2fbeb1a..89aff5d3220 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserConsentWithUserStorageModelTest.java @@ -17,10 +17,10 @@ package org.keycloak.testsuite.model; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import java.util.List; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; @@ -42,9 +42,10 @@ import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.federation.HardcodedClientStorageProviderFactory; import org.keycloak.testsuite.federation.UserMapStorageFactory; -import java.util.List; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import static org.keycloak.storage.UserStorageProviderModel.IMPORT_ENABLED; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserModelTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserModelTest.java index f34c1842780..f49102d608f 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserModelTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserModelTest.java @@ -17,8 +17,15 @@ package org.keycloak.testsuite.model; -import org.junit.Assert; -import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -33,15 +40,10 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.testsuite.util.RealmBuilder; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; +import org.junit.Assert; +import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; @@ -49,7 +51,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java index adcbd478e61..a2a47b5c359 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderOfflineTest.java @@ -17,10 +17,13 @@ package org.keycloak.testsuite.model; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicReference; + import org.keycloak.common.util.Time; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; @@ -39,12 +42,10 @@ import org.keycloak.services.managers.UserSessionManager; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicReference; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java index ced3ad150b5..e0889256ab3 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/model/UserSessionProviderTest.java @@ -17,12 +17,15 @@ package org.keycloak.testsuite.model; -import org.hamcrest.Matchers; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + import org.keycloak.common.util.Time; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; @@ -40,15 +43,14 @@ import org.keycloak.provider.ProviderEventListener; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; +import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; -import java.util.Arrays; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.stream.Collectors; +import org.hamcrest.Matchers; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertArrayEquals; @@ -57,7 +59,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AbstractClientAuthSignedJWTTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AbstractClientAuthSignedJWTTest.java index ac2bf7c54cc..0d2660e2edb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AbstractClientAuthSignedJWTTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AbstractClientAuthSignedJWTTest.java @@ -17,10 +17,6 @@ package org.keycloak.testsuite.oauth; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; - import java.io.BufferedWriter; import java.io.ByteArrayInputStream; import java.io.File; @@ -53,27 +49,6 @@ import java.util.Set; import jakarta.ws.rs.core.Response; -import org.apache.http.HttpEntity; -import org.apache.http.HttpHeaders; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.client.HttpClient; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.mime.MultipartEntityBuilder; -import org.apache.http.entity.mime.content.FileBody; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.message.BasicNameValuePair; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.rules.TemporaryFolder; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientAttributeCertificateResource; @@ -85,10 +60,10 @@ import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.KeyUtils; import org.keycloak.common.util.KeycloakUriBuilder; import org.keycloak.common.util.KeystoreUtil; +import org.keycloak.common.util.KeystoreUtil.KeystoreFormat; import org.keycloak.common.util.PemUtils; import org.keycloak.common.util.Time; import org.keycloak.common.util.UriUtils; -import org.keycloak.common.util.KeystoreUtil.KeystoreFormat; import org.keycloak.constants.ServiceUrlConstants; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.ECDSAAlgorithm; @@ -126,13 +101,39 @@ import org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResou import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.KeystoreUtils; +import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.SignatureSignerUtil; +import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.RealmBuilder; -import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; +import org.apache.http.HttpEntity; +import org.apache.http.HttpHeaders; +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.HttpClient; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.mime.MultipartEntityBuilder; +import org.apache.http.entity.mime.content.FileBody; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.apache.http.message.BasicNameValuePair; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.rules.TemporaryFolder; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; + public abstract class AbstractClientAuthSignedJWTTest extends AbstractKeycloakTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsNotCleanedUpTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsNotCleanedUpTest.java index 39f211b0951..5b6f116c695 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsNotCleanedUpTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsNotCleanedUpTest.java @@ -18,19 +18,21 @@ package org.keycloak.testsuite.oauth; import java.util.List; -import static org.junit.Assert.assertEquals; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.openqa.selenium.By; + import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.openqa.selenium.By; +import static org.junit.Assert.assertEquals; /** * @author Slawomir Dabek diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsTest.java index 7fbf3b06179..9ecd9514c3c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenDuplicateEmailsTest.java @@ -16,23 +16,24 @@ */ package org.keycloak.testsuite.oauth; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.List; + import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.List; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.openqa.selenium.By; -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; -import org.openqa.selenium.By; +import static org.junit.Assert.assertEquals; /** * @author Slawomir Dabek diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenNoEmailLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenNoEmailLoginTest.java index 19b1ffde3d6..24f097b2351 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenNoEmailLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenNoEmailLoginTest.java @@ -18,17 +18,19 @@ package org.keycloak.testsuite.oauth; import java.util.List; -import static org.junit.Assert.assertEquals; -import org.junit.Before; -import org.junit.Test; import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import org.junit.Before; +import org.junit.Test; +import org.openqa.selenium.By; + import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.openqa.selenium.By; +import static org.junit.Assert.assertEquals; /** * @author Slawomir Dabek diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenResponseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenResponseTest.java index d54f454db87..df2d1e73c86 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenResponseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenResponseTest.java @@ -1,16 +1,10 @@ package org.keycloak.testsuite.oauth; -import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; - import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.mappers.HardcodedClaim; @@ -20,8 +14,16 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; + +import static org.junit.Assert.assertEquals; public class AccessTokenResponseTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java index fe1fe959f1b..971584c0791 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AccessTokenTest.java @@ -16,22 +16,23 @@ */ package org.keycloak.testsuite.oauth; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.TreeNode; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.TextNode; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.TimeUnit; +import java.util.stream.Stream; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientScopeResource; @@ -82,35 +83,45 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.RealmManager; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.TokenSignatureUtil; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.UserInfoClientUtil; import org.keycloak.testsuite.util.UserManager; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.UserInfoResponse; import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; import org.keycloak.utils.MediaType; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.TreeNode; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.TextNode; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.Form; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import java.util.stream.Stream; +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.Assert.assertExpiration; +import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsernameId; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createRoleNameMapper; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; +import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -122,14 +133,6 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.Assert.assertExpiration; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsernameId; -import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createRoleNameMapper; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java index ddec9030a5b..139d941e68d 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/AuthorizationCodeTest.java @@ -16,15 +16,16 @@ */ package org.keycloak.testsuite.oauth; +import java.io.IOException; +import java.net.URI; +import java.util.Collections; +import java.util.List; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.events.Details; @@ -42,14 +43,17 @@ import org.keycloak.testsuite.pages.InstalledAppRedirectPage; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.WaitUtils; +import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; + +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; -import java.io.IOException; -import java.net.URI; -import java.util.Collections; -import java.util.List; +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; @@ -57,7 +61,6 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java index d77b6085b9d..f1adc3da240 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/BackchannelLogoutTest.java @@ -1,19 +1,16 @@ package org.keycloak.testsuite.oauth; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; -import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword; -import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; -import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; +import java.io.IOException; +import java.security.KeyPair; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -36,27 +33,32 @@ import org.keycloak.testsuite.broker.NestedBrokerConfiguration; import org.keycloak.testsuite.broker.OidcBackchannelLogoutBrokerConfiguration; import org.keycloak.testsuite.util.CredentialBuilder; import org.keycloak.testsuite.util.LogoutTokenUtil; +import org.keycloak.testsuite.util.RealmManager; +import org.keycloak.testsuite.util.SecondBrowser; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.util.oauth.BackchannelLogoutResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.RealmManager; -import org.keycloak.testsuite.util.SecondBrowser; import org.keycloak.util.JsonSerialization; + +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; - -import java.io.IOException; -import java.security.KeyPair; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; -import java.util.stream.Collectors; - -import jakarta.ws.rs.core.Response; import org.openqa.selenium.WebElement; +import static org.keycloak.testsuite.admin.ApiUtil.createUserWithAdminClient; +import static org.keycloak.testsuite.admin.ApiUtil.resetUserPassword; +import static org.keycloak.testsuite.broker.BrokerTestTools.getConsumerRoot; +import static org.keycloak.testsuite.util.WaitUtils.waitUntilElement; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class BackchannelLogoutTest extends AbstractNestedBrokerTest { public static final String ACCOUNT_CLIENT_NAME = "account"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthEdDSASignedJWTTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthEdDSASignedJWTTest.java index 4b296329c48..beffc02e589 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthEdDSASignedJWTTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthEdDSASignedJWTTest.java @@ -17,10 +17,11 @@ package org.keycloak.testsuite.oauth; -import org.junit.Test; import org.keycloak.crypto.Algorithm; import org.keycloak.testsuite.util.KeyUtils; +import org.junit.Test; + /** * @author Takashi Norimatsu */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthPostMethodTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthPostMethodTest.java index 539450b6ab4..dfaf91bcf74 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthPostMethodTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthPostMethodTest.java @@ -18,6 +18,20 @@ package org.keycloak.testsuite.oauth; import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.LinkedList; +import java.util.List; + +import org.keycloak.OAuth2Constants; +import org.keycloak.events.Details; +import org.keycloak.representations.AccessToken; +import org.keycloak.representations.idm.EventRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractAdminTest; +import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.HttpPost; @@ -26,25 +40,12 @@ import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.message.BasicNameValuePair; import org.junit.Rule; import org.junit.Test; -import org.keycloak.OAuth2Constants; -import org.keycloak.events.Details; -import org.keycloak.representations.AccessToken; -import org.keycloak.representations.idm.EventRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.AbstractAdminTest; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; - -import java.nio.charset.StandardCharsets; -import java.util.LinkedList; -import java.util.List; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; /** * Test for "client_secret_post" client authentication (clientID + clientSecret sent in the POST body instead of in "Authorization: Basic" header) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java index dc3da178175..c3b4bd963b9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSecretSignedJWTTest.java @@ -28,20 +28,6 @@ import java.util.Map; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.apache.http.HttpStatus; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.message.BasicNameValuePair; -import org.jboss.logging.Logger; -import org.jetbrains.annotations.NotNull; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -70,16 +56,31 @@ import org.keycloak.services.clientpolicy.condition.ClientAccessTypeCondition; import org.keycloak.services.clientpolicy.condition.ClientAccessTypeConditionFactory; import org.keycloak.services.clientpolicy.executor.ClientSecretRotationExecutor; import org.keycloak.services.clientpolicy.executor.ClientSecretRotationExecutorFactory; +import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.ClientPoliciesUtil; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.ServerURLs; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.util.JsonSerialization; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.message.BasicNameValuePair; +import org.jboss.logging.Logger; +import org.jetbrains.annotations.NotNull; +import org.junit.Rule; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java index d804d1d79cb..cf4a01d52f5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ClientAuthSignedJWTTest.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.oauth; -import org.apache.http.HttpResponse; -import org.apache.http.NameValuePair; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Test; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -45,16 +46,16 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.KeystoreUtils; import org.keycloak.testsuite.util.KeyUtils; +import org.keycloak.testsuite.util.KeystoreUtils; import org.keycloak.testsuite.util.SignatureSignerUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.security.KeyPair; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.util.LinkedList; -import java.util.List; +import org.apache.http.HttpResponse; +import org.apache.http.NameValuePair; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/DPoPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/DPoPTest.java index 82f8f9a72f6..7621f01b141 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/DPoPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/DPoPTest.java @@ -17,18 +17,27 @@ package org.keycloak.testsuite.oauth; +import java.io.IOException; +import java.security.KeyPair; +import java.security.PrivateKey; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.function.BiConsumer; +import java.util.function.Consumer; +import java.util.stream.Collectors; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.HttpMethod; import jakarta.ws.rs.ProcessingException; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.Keycloak; @@ -79,40 +88,25 @@ import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; +import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.IntrospectionResponse; import org.keycloak.testsuite.util.oauth.UserInfoResponse; -import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.util.DPoPGenerator; import org.keycloak.util.JWKSUtils; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; import org.keycloak.utils.MediaType; -import java.io.IOException; -import java.security.KeyPair; -import java.security.PrivateKey; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.stream.Collectors; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; -import static org.hamcrest.Matchers.emptyOrNullString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.keycloak.OAuth2Constants.DPOP_HTTP_HEADER; import static org.keycloak.OAuth2Constants.DPOP_JWT_HEADER_TYPE; import static org.keycloak.OAuthErrorException.INVALID_TOKEN; @@ -126,6 +120,15 @@ import static org.keycloak.testsuite.util.ClientPoliciesUtil.createRsaJwk; import static org.keycloak.testsuite.util.ClientPoliciesUtil.generateEcdsaKey; import static org.keycloak.testsuite.util.ClientPoliciesUtil.generateSignedDPoPProof; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.startsWith; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class DPoPTest extends AbstractTestRealmKeycloakTest { private static final String REALM_NAME = "test"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LoginStatusIframeEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LoginStatusIframeEndpointTest.java index b0162173f70..be25216f572 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LoginStatusIframeEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LoginStatusIframeEndpointTest.java @@ -17,7 +17,31 @@ package org.keycloak.testsuite.oauth; +import java.io.IOException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Response; + +import org.keycloak.admin.client.resource.ClientResource; +import org.keycloak.models.BrowserSecurityHeaders; +import org.keycloak.models.Constants; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.ErrorRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.ActionURIUtils; +import org.keycloak.testsuite.runonserver.ServerVersion; +import org.keycloak.testsuite.updaters.RealmAttributeUpdater; +import org.keycloak.testsuite.util.AdminClientUtil; +import org.keycloak.testsuite.util.RealmBuilder; +import org.keycloak.testsuite.util.oauth.PkceGenerator; + import org.apache.commons.io.IOUtils; import org.apache.http.Header; import org.apache.http.NameValuePair; @@ -32,29 +56,6 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicNameValuePair; import org.junit.Test; -import org.keycloak.admin.client.resource.ClientResource; -import org.keycloak.models.BrowserSecurityHeaders; -import org.keycloak.models.Constants; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.ErrorRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.ActionURIUtils; -import org.keycloak.testsuite.runonserver.ServerVersion; -import org.keycloak.testsuite.updaters.RealmAttributeUpdater; -import org.keycloak.testsuite.util.AdminClientUtil; -import org.keycloak.testsuite.util.RealmBuilder; - -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.core.Response; -import org.keycloak.testsuite.util.oauth.PkceGenerator; - -import java.io.IOException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutCorsTest.java index 245cee8b7e3..ca6a908fb00 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutCorsTest.java @@ -22,19 +22,21 @@ import java.util.List; import jakarta.ws.rs.core.Response; -import org.junit.Before; -import org.junit.Test; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.RealmBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.LogoutResponse; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java index f53e85a65a3..e26f1b8bd58 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/LogoutTest.java @@ -17,17 +17,14 @@ package org.keycloak.testsuite.oauth; +import java.io.IOException; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response.Status; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.hamcrest.MatcherAssert; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.admin.client.resource.RealmResource; @@ -64,17 +61,23 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.LogoutResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import java.io.IOException; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.hamcrest.MatcherAssert; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; /** * Tests mostly for backchannel logout scenarios with refresh token (Legacy Logout endpoint not compliant with OIDC specification) and admin logout scenarios diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2DeviceAuthorizationGrantTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2DeviceAuthorizationGrantTest.java index b7c066559c2..b3d8490f9f8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2DeviceAuthorizationGrantTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2DeviceAuthorizationGrantTest.java @@ -16,18 +16,10 @@ */ package org.keycloak.testsuite.oauth; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.keycloak.models.OAuth2DeviceConfig.DEFAULT_OAUTH2_DEVICE_CODE_LIFESPAN; -import static org.keycloak.models.OAuth2DeviceConfig.DEFAULT_OAUTH2_DEVICE_POLLING_INTERVAL; +import java.nio.charset.StandardCharsets; +import java.util.LinkedList; +import java.util.List; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -56,25 +48,34 @@ import org.keycloak.testsuite.pages.OAuth2DeviceVerificationPage; import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.ContainerAssume; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.PkceGenerator; -import org.keycloak.testsuite.util.oauth.device.DeviceAuthorizationResponse; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.keycloak.testsuite.util.oauth.PkceGenerator; +import org.keycloak.testsuite.util.oauth.device.DeviceAuthorizationResponse; +import org.keycloak.util.BasicAuthHelper; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.message.BasicNameValuePair; -import org.apache.http.impl.client.CloseableHttpClient; -import org.keycloak.util.BasicAuthHelper; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.Cookie; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.LinkedList; +import static org.keycloak.models.OAuth2DeviceConfig.DEFAULT_OAUTH2_DEVICE_CODE_LIFESPAN; +import static org.keycloak.models.OAuth2DeviceConfig.DEFAULT_OAUTH2_DEVICE_POLLING_INTERVAL; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; /** * @author Hiroyuki Wada diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2OnlyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2OnlyTest.java index fa78c38e11c..7eb637324b3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2OnlyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuth2OnlyTest.java @@ -20,11 +20,6 @@ package org.keycloak.testsuite.oauth; import java.util.Arrays; import java.util.Collections; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.events.Details; import org.keycloak.events.Errors; @@ -41,9 +36,16 @@ import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import static org.junit.Assert.assertEquals; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; +import static org.junit.Assert.assertEquals; + /** * Test for scenarios when 'scope=openid' is missing. Which means we have pure OAuth2 request (not OpenID Connect) * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthDanceClientSessionExtensionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthDanceClientSessionExtensionTest.java index 154bd53c02d..c005dbc711b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthDanceClientSessionExtensionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthDanceClientSessionExtensionTest.java @@ -17,8 +17,8 @@ package org.keycloak.testsuite.oauth; -import org.junit.Rule; -import org.junit.Test; +import java.util.List; + import org.keycloak.events.Details; import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; @@ -26,7 +26,8 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.List; +import org.junit.Rule; +import org.junit.Test; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java index 5dac1db4dff..b3cbc8dea52 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthGrantTest.java @@ -16,11 +16,13 @@ */ package org.keycloak.testsuite.oauth; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientScopeResource; import org.keycloak.admin.client.resource.RealmResource; @@ -43,23 +45,23 @@ import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LogoutConfirmPage; import org.keycloak.testsuite.pages.OAuthGrantPage; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.ProtocolMapperUtil; import org.keycloak.testsuite.util.AccountHelper; +import org.keycloak.testsuite.util.ProtocolMapperUtil; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import jakarta.ws.rs.core.Response; - -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; +import static org.junit.Assert.assertEquals; + /** * @author Viliam Rockai */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java index 0f11faac785..10c1468f522 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthProofKeyForCodeExchangeTest.java @@ -1,9 +1,9 @@ package org.keycloak.testsuite.oauth; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.security.MessageDigest; +import java.util.List; +import java.util.stream.Stream; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -26,23 +26,25 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.ClientManager; +import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import org.keycloak.testsuite.util.UserBuilder; -import java.security.MessageDigest; -import java.util.List; -import java.util.stream.Stream; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; //https://tools.ietf.org/html/rfc7636 diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriStateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriStateTest.java index 6d6c3285ac8..cec9010b9bd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriStateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriStateTest.java @@ -20,14 +20,15 @@ package org.keycloak.testsuite.oauth; import java.net.MalformedURLException; import java.net.URL; -import org.junit.Before; -import org.junit.Test; import org.keycloak.protocol.oidc.utils.OIDCResponseType; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; +import org.junit.Before; +import org.junit.Test; + public class OAuthRedirectUriStateTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java index cc0a8ead42a..52210cb4a7f 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthRedirectUriTest.java @@ -16,21 +16,12 @@ */ package org.keycloak.testsuite.oauth; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; -import com.sun.net.httpserver.HttpServer; -import org.apache.http.client.CookieStore; -import org.apache.http.client.config.CookieSpecs; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.impl.client.BasicCookieStore; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.io.OutputStream; +import java.net.InetSocketAddress; +import java.net.URL; +import java.util.List; + import org.keycloak.OAuth2Constants; import org.keycloak.common.util.Encode; import org.keycloak.common.util.KeycloakUriBuilder; @@ -49,16 +40,27 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import java.io.IOException; -import java.io.OutputStream; -import java.net.InetSocketAddress; -import java.net.URL; -import java.util.List; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import com.sun.net.httpserver.HttpServer; +import org.apache.http.client.CookieStore; +import org.apache.http.client.config.CookieSpecs; +import org.apache.http.client.config.RequestConfig; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.impl.client.BasicCookieStore; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.util.oauth.OAuthClient.APP_ROOT; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.util.oauth.OAuthClient.APP_ROOT; /** * @author Viliam Rockai diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java index 78cdf9cabb0..9116ed3b2ee 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OAuthScopeInTokenResponseTest.java @@ -1,10 +1,5 @@ package org.keycloak.testsuite.oauth; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; - import java.net.URL; import java.util.Arrays; import java.util.Collection; @@ -12,8 +7,6 @@ import java.util.List; import jakarta.ws.rs.core.Response; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -27,6 +20,15 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + //OIDC Financial API Read Only Profile : scope MUST be returned in the response from Token Endpoint public class OAuthScopeInTokenResponseTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java index ee6f9d012be..ac0f640232c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OIDCProtocolMappersTest.java @@ -17,10 +17,20 @@ package org.keycloak.testsuite.oauth; -import org.hamcrest.CoreMatchers; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientScopeResource; import org.keycloak.admin.client.resource.ProtocolMappersResource; @@ -57,25 +67,29 @@ import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.ProtocolMappersUpdater; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.ProtocolMapperUtil; import org.keycloak.testsuite.util.UserInfoClientUtil; - -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.core.Response; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.userprofile.UserProfileUtil; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.hamcrest.CoreMatchers; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.OAuth2Constants.SCOPE_PROFILE; +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; +import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsernameId; +import static org.keycloak.testsuite.admin.ApiUtil.getCreatedId; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createAddressMapper; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createClaimMapper; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createHardcodedClaim; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createHardcodedRole; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createRoleNameMapper; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createScriptMapper; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.anyOf; @@ -93,18 +107,6 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.OAuth2Constants.SCOPE_PROFILE; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; -import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsernameId; -import static org.keycloak.testsuite.admin.ApiUtil.getCreatedId; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createAddressMapper; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createClaimMapper; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createHardcodedClaim; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createHardcodedRole; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createRoleNameMapper; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createScriptMapper; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenMigrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenMigrationTest.java index 1c1cfc96c87..9fa94aa8089 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenMigrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenMigrationTest.java @@ -23,9 +23,6 @@ import java.io.Serializable; import java.util.Map; import java.util.function.BiFunction; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.crypto.SignatureProvider; import org.keycloak.crypto.SignatureSignerContext; @@ -43,6 +40,10 @@ import org.keycloak.testsuite.runonserver.FetchOnServerWrapper; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.util.JsonSerialization; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Test; + /** * Test for simulating token refresh with the offline tokens created in older Keycloak versions. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java index 4bf8a060cf6..79718337bfb 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/OfflineTokenTest.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.oauth; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.NotFoundException; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.Keycloak; @@ -64,25 +65,37 @@ import org.keycloak.testsuite.auth.page.AuthRealm; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; +import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.RealmManager; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.TokenSignatureUtil; import org.keycloak.testsuite.util.UserBuilder; -import org.keycloak.testsuite.util.AccountHelper; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.IntrospectionResponse; import org.keycloak.testsuite.util.oauth.LogoutResponse; import org.keycloak.testsuite.utils.tls.TLSUtils; import org.keycloak.util.TokenUtil; -import jakarta.ws.rs.NotFoundException; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.Assert.assertExpiration; +import static org.keycloak.testsuite.admin.ApiUtil.findRealmRoleByName; +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsernameId; +import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; +import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; +import static org.keycloak.testsuite.util.oauth.OAuthClient.APP_ROOT; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.lessThanOrEqualTo; @@ -90,18 +103,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.Assert.assertExpiration; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findRealmRoleByName; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsernameId; -import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; -import static org.keycloak.testsuite.util.oauth.OAuthClient.APP_ROOT; -import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; - -import com.fasterxml.jackson.databind.JsonNode; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/PreAuthorizedGrantTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/PreAuthorizedGrantTest.java index 5bd62376376..b0c989d3138 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/PreAuthorizedGrantTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/PreAuthorizedGrantTest.java @@ -17,16 +17,12 @@ package org.keycloak.testsuite.oauth; +import java.nio.charset.StandardCharsets; +import java.util.LinkedList; +import java.util.List; + import jakarta.ws.rs.core.UriBuilder; -import org.apache.http.HttpStatus; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.common.Profile; import org.keycloak.common.util.Time; @@ -36,13 +32,19 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; +import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import org.keycloak.testsuite.util.UserBuilder; -import java.nio.charset.StandardCharsets; -import java.util.LinkedList; -import java.util.List; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Before; +import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RFC8414CompliantOAuth2WellKnownProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RFC8414CompliantOAuth2WellKnownProviderTest.java index dacd560516a..64881a1f472 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RFC8414CompliantOAuth2WellKnownProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RFC8414CompliantOAuth2WellKnownProviderTest.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.oauth; +import java.net.URI; + import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.protocol.oauth2.OAuth2WellKnownProviderFactory; import org.keycloak.services.resources.ServerMetadataResource; import org.keycloak.testsuite.oidc.AbstractWellKnownProviderTest; -import java.net.URI; - public class RFC8414CompliantOAuth2WellKnownProviderTest extends AbstractWellKnownProviderTest { protected String getWellKnownProviderId() { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java index ce6e805b5fb..2a874f7bdc5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RPInitiatedLogoutTest.java @@ -17,36 +17,6 @@ */ package org.keycloak.testsuite.oauth; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.hamcrest.MatcherAssert; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.keycloak.OAuth2Constants; -import org.keycloak.OAuthErrorException; -import org.keycloak.admin.client.resource.UserResource; -import org.keycloak.common.util.UriUtils; -import org.keycloak.events.Details; -import org.keycloak.events.Errors; -import org.keycloak.models.Constants; -import org.keycloak.models.UserModel; -import org.keycloak.protocol.oidc.OIDCConfigAttributes; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.pages.AppPage; -import org.keycloak.testsuite.pages.ErrorPage; -import org.keycloak.testsuite.pages.InfoPage; -import org.keycloak.testsuite.pages.LoginPage; - import java.io.Closeable; import java.io.IOException; import java.util.Collections; @@ -59,16 +29,26 @@ import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import static org.hamcrest.Matchers.endsWith; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlEquals; - +import org.keycloak.OAuth2Constants; +import org.keycloak.OAuthErrorException; +import org.keycloak.admin.client.resource.UserResource; +import org.keycloak.common.util.UriUtils; +import org.keycloak.events.Details; +import org.keycloak.events.Errors; +import org.keycloak.models.Constants; +import org.keycloak.models.UserModel; +import org.keycloak.protocol.oidc.OIDCConfigAttributes; +import org.keycloak.protocol.oidc.OIDCLoginProtocol; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; +import org.keycloak.testsuite.Assert; +import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.pages.AppPage; +import org.keycloak.testsuite.pages.ErrorPage; +import org.keycloak.testsuite.pages.InfoPage; +import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LogoutConfirmPage; import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.pages.PageUtils; @@ -79,11 +59,32 @@ import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; import org.keycloak.testsuite.util.Matchers; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.URLUtils; import org.keycloak.testsuite.util.WaitUtils; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.hamcrest.MatcherAssert; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.NoSuchElementException; +import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlEquals; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Test for OIDC RP-Initiated Logout - https://openid.net/specs/openid-connect-rpinitiated-1_0.html *

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java index 8990fc26a9e..c8522a7959e 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/RefreshTokenTest.java @@ -16,17 +16,20 @@ */ package org.keycloak.testsuite.oauth; -import com.fasterxml.jackson.databind.JsonNode; - import java.io.Closeable; -import org.hamcrest.CoreMatchers; -import org.hamcrest.Matchers; -import org.infinispan.Cache; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.net.URI; +import java.util.List; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -87,19 +90,28 @@ import org.keycloak.testsuite.util.UserManager; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.util.BasicAuthHelper; + +import com.fasterxml.jackson.databind.JsonNode; +import org.hamcrest.CoreMatchers; +import org.hamcrest.Matchers; +import org.infinispan.Cache; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.Cookie; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.Form; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import java.net.URI; -import java.util.List; -import java.util.UUID; -import java.util.concurrent.TimeUnit; +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.USER_SESSION_CACHE_NAME; +import static org.keycloak.protocol.oidc.OIDCConfigAttributes.CLIENT_SESSION_IDLE_TIMEOUT; +import static org.keycloak.protocol.oidc.OIDCConfigAttributes.CLIENT_SESSION_MAX_LIFESPAN; +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.Assert.assertExpiration; +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.arquillian.AuthServerTestEnricher.getHttpAuthServerContextRoot; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; +import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -113,16 +125,6 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.USER_SESSION_CACHE_NAME; -import static org.keycloak.protocol.oidc.OIDCConfigAttributes.CLIENT_SESSION_IDLE_TIMEOUT; -import static org.keycloak.protocol.oidc.OIDCConfigAttributes.CLIENT_SESSION_MAX_LIFESPAN; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.Assert.assertExpiration; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import static org.keycloak.testsuite.arquillian.AuthServerTestEnricher.getHttpAuthServerContextRoot; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; -import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; /** * @author Stian Thorgersen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java index 686312713bc..f63c4577f4a 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ResourceOwnerPasswordCredentialsGrantTest.java @@ -17,17 +17,15 @@ package org.keycloak.testsuite.oauth; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; + import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -68,10 +66,14 @@ import org.keycloak.testsuite.util.UserManager; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.LogoutResponse; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Rule; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java index 4537ba3268a..25b4929784f 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountTest.java @@ -17,12 +17,13 @@ package org.keycloak.testsuite.oauth; -import com.fasterxml.jackson.databind.JsonNode; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.ClientErrorException; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.authenticators.client.ClientIdAndSecretAuthenticator; @@ -51,19 +52,20 @@ import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.TokenSignatureUtil; import org.keycloak.testsuite.util.UserBuilder; - -import jakarta.ws.rs.ClientErrorException; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.LogoutResponse; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.databind.JsonNode; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.emptyOrNullString; import static org.hamcrest.Matchers.hasSize; @@ -71,7 +73,6 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertTrue; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountUserProfileTest.java index 79b6f4b7e0f..b7cfe561d1b 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/ServiceAccountUserProfileTest.java @@ -17,19 +17,12 @@ package org.keycloak.testsuite.oauth; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThrows; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; - -import jakarta.ws.rs.BadRequestException; import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Test; + +import jakarta.ws.rs.BadRequestException; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.constants.ServiceAccountConstants; @@ -49,6 +42,16 @@ import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.userprofile.UserProfileConstants; import org.keycloak.validate.validators.EmailValidator; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java index 504cd39d553..5762dcde33e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenEndpointCorsTest.java @@ -1,18 +1,5 @@ package org.keycloak.testsuite.oauth; -import org.apache.http.Header; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpOptions; -import org.junit.Rule; -import org.junit.Test; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.services.cors.Cors; -import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.util.ClientBuilder; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.OAuthClient; - import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -20,10 +7,25 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.services.cors.Cors; +import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.util.ClientBuilder; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.apache.http.Header; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpOptions; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; /** * @author Martin Kanis diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java index e942cfa13a4..56745556d51 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenIntrospectionTest.java @@ -16,20 +16,13 @@ */ package org.keycloak.testsuite.oauth; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.TextNode; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Optional; -import org.apache.commons.io.output.ByteArrayOutputStream; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.message.BasicNameValuePair; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientScopesResource; @@ -48,27 +41,34 @@ import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.oidc.TokenMetadataRepresentation; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.oidc.OIDCScopeTest; import org.keycloak.testsuite.oidc.AbstractOIDCScopeTest; +import org.keycloak.testsuite.oidc.OIDCScopeTest; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.KeycloakModelUtils; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.TokenSignatureUtil; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.IntrospectionResponse; import org.keycloak.util.BasicAuthHelper; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.TextNode; +import org.apache.commons.io.output.ByteArrayOutputStream; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.message.BasicNameValuePair; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Rule; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationCorsTest.java index 19542046d17..b06289a415b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationCorsTest.java @@ -17,8 +17,11 @@ package org.keycloak.testsuite.oauth; +import java.io.IOException; +import java.util.List; + import jakarta.ws.rs.core.Response.Status; -import org.junit.Test; + import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.oidc.TokenMetadataRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; @@ -26,14 +29,14 @@ import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.TokenRevocationResponse; -import java.io.IOException; -import java.util.List; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; /** * @author Yoshiyuki Tabata diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationTest.java index 4322d26f70a..31fc7456f61 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/TokenRevocationTest.java @@ -17,13 +17,6 @@ package org.keycloak.testsuite.oauth; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AssertEvents.isTokenId; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; - import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.LinkedList; @@ -35,18 +28,6 @@ import jakarta.ws.rs.client.Client; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.apache.commons.io.output.ByteArrayOutputStream; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.message.BasicNameValuePair; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.Keycloak; @@ -66,14 +47,35 @@ import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserInfoClientUtil; -import org.keycloak.testsuite.util.InfinispanTestTimeServiceRule; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; +import org.apache.commons.io.output.ByteArrayOutputStream; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.message.BasicNameValuePair; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.AssertEvents.isTokenId; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * @author Yoshiyuki Tabata */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/UserInfoEndpointCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/UserInfoEndpointCorsTest.java index aa3f7ba7a7c..e324ae3b080 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/UserInfoEndpointCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/UserInfoEndpointCorsTest.java @@ -1,25 +1,28 @@ package org.keycloak.testsuite.oauth; -import org.jboss.resteasy.client.jaxrs.ResteasyClient; -import org.junit.Test; +import java.util.List; + +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ClientBuilder; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.UserInfoClientUtil; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import java.util.List; +import org.jboss.resteasy.client.jaxrs.ResteasyClient; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; public class UserInfoEndpointCorsTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java index e1af63626b0..9ea98bafe68 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/hok/HoKTest.java @@ -1,18 +1,20 @@ package org.keycloak.testsuite.oauth.hok; +import java.io.IOException; +import java.net.URI; +import java.security.KeyStore; +import java.security.MessageDigest; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Stream; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import org.apache.http.impl.client.CloseableHttpClient; -import org.hamcrest.Matchers; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.junit.Assume; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.common.util.KeystoreUtil; @@ -53,16 +55,19 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.LogoutResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.apache.http.impl.client.CloseableHttpClient; +import org.hamcrest.Matchers; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.junit.Assume; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.WebDriver; -import java.io.IOException; -import java.net.URI; -import java.security.KeyStore; -import java.security.MessageDigest; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Stream; +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; @@ -72,8 +77,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; public class HoKTest extends AbstractTestRealmKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParEndpointTest.java index 58eb74b0543..3986093b01a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParEndpointTest.java @@ -17,15 +17,16 @@ package org.keycloak.testsuite.oauth.par; -import jakarta.ws.rs.core.MultivaluedHashMap; -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.protocol.oidc.par.endpoints.ParEndpoint; - - import java.util.HashMap; import java.util.List; +import jakarta.ws.rs.core.MultivaluedHashMap; + +import org.keycloak.protocol.oidc.par.endpoints.ParEndpoint; + +import org.junit.Assert; +import org.junit.Test; + import static org.keycloak.OAuth2Constants.AUTHORIZATION_DETAILS_PARAM; public class ParEndpointTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java index 12af1e8fd7a..c4f241a9edd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParTest.java @@ -17,16 +17,6 @@ package org.keycloak.testsuite.oauth.par; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.startsWith; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -36,8 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Optional; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.common.util.Base64Url; @@ -67,21 +55,34 @@ import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResou import org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResource; import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExceptionExecutorFactory; import org.keycloak.testsuite.util.ClientBuilder; -import org.keycloak.testsuite.util.oauth.AbstractHttpResponse; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPoliciesBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientPolicyBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfileBuilder; import org.keycloak.testsuite.util.ClientPoliciesUtil.ClientProfilesBuilder; +import org.keycloak.testsuite.util.RoleBuilder; +import org.keycloak.testsuite.util.oauth.AbstractHttpResponse; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.oauth.ParResponse; import org.keycloak.util.JsonSerialization; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsername; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientRolesConditionConfig; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.startsWith; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class ParTest extends AbstractClientPoliciesTest { // defined in testrealm.json diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParWithDPoPTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParWithDPoPTest.java index 51527e535d5..966fe38c434 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParWithDPoPTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/par/ParWithDPoPTest.java @@ -24,9 +24,7 @@ import java.util.Random; import java.util.UUID; import jakarta.ws.rs.HttpMethod; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -47,7 +45,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.oidc.OIDCClientRepresentation; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; - import org.keycloak.testsuite.client.policies.AbstractClientPoliciesTest; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; @@ -58,14 +55,19 @@ import org.keycloak.testsuite.util.oauth.ParResponse; import org.keycloak.util.JWKSUtils; import org.keycloak.util.JsonSerialization; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createEcJwk; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createRsaJwk; import static org.keycloak.testsuite.util.ClientPoliciesUtil.generateEcdsaKey; import static org.keycloak.testsuite.util.ClientPoliciesUtil.generateSignedDPoPProof; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class ParWithDPoPTest extends AbstractClientPoliciesTest { @Rule public AssertEvents events = new AssertEvents(this); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AbstractRARParserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AbstractRARParserTest.java index 12e84050c4a..04d7198bddc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AbstractRARParserTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AbstractRARParserTest.java @@ -17,8 +17,10 @@ */ package org.keycloak.testsuite.oauth.rar; -import org.junit.Before; -import org.junit.Rule; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + import org.keycloak.OAuth2Constants; import org.keycloak.common.Profile; import org.keycloak.models.AuthenticatedClientSessionModel; @@ -36,9 +38,8 @@ import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; -import java.util.List; -import java.util.UUID; -import java.util.stream.Collectors; +import org.junit.Before; +import org.junit.Rule; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AuthorizationRequestContextHolder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AuthorizationRequestContextHolder.java index 3709dcb6ec0..348cc45218a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AuthorizationRequestContextHolder.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/AuthorizationRequestContextHolder.java @@ -17,15 +17,15 @@ */ package org.keycloak.testsuite.oauth.rar; -import org.keycloak.models.utils.ModelToRepresentation; -import org.keycloak.rar.AuthorizationDetails; -import org.keycloak.representations.AuthorizationDetailsJSONRepresentation; -import org.keycloak.rar.AuthorizationRequestSource; -import org.keycloak.representations.idm.ClientScopeRepresentation; - import java.util.List; import java.util.Objects; +import org.keycloak.models.utils.ModelToRepresentation; +import org.keycloak.rar.AuthorizationDetails; +import org.keycloak.rar.AuthorizationRequestSource; +import org.keycloak.representations.AuthorizationDetailsJSONRepresentation; +import org.keycloak.representations.idm.ClientScopeRepresentation; + /** * The local testsuite representation of a {@link org.keycloak.rar.AuthorizationRequestContext} server object * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java index 9bd40e08c84..5ed0a4ad9cd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/rar/DynamicScopesRARParseTest.java @@ -17,24 +17,26 @@ */ package org.keycloak.testsuite.oauth.rar; -import org.junit.Assert; -import org.junit.Test; +import java.util.HashMap; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.common.Profile; import org.keycloak.models.ClientScopeModel; import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import org.keycloak.representations.AuthorizationDetailsJSONRepresentation; import org.keycloak.rar.AuthorizationRequestSource; +import org.keycloak.representations.AuthorizationDetailsJSONRepresentation; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; -import jakarta.ws.rs.core.Response; -import java.util.HashMap; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; +import org.junit.Assert; +import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ClientTokenExchangeSAML2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ClientTokenExchangeSAML2Test.java index 4c3468afac5..5aee0dae203 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ClientTokenExchangeSAML2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ClientTokenExchangeSAML2Test.java @@ -19,8 +19,19 @@ package org.keycloak.testsuite.oauth.tokenexchange; -import org.junit.Rule; -import org.junit.Test; +import java.nio.charset.StandardCharsets; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.util.Collections; +import java.util.List; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.TokenVerifier; import org.keycloak.authorization.model.Policy; @@ -64,28 +75,19 @@ import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.KeyUtils; import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.util.BasicAuthHelper; + +import org.junit.Rule; +import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.Form; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; - -import java.nio.charset.StandardCharsets; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.util.Collections; -import java.util.List; - -import static org.junit.Assert.assertNotNull; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_ID; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_USERNAME; import static org.keycloak.protocol.saml.SamlProtocol.SAML_ASSERTION_CONSUMER_URL_POST_ATTRIBUTE; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; +import static org.junit.Assert.assertNotNull; + /** * @author Hiroyuki Wada */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ExternalInternalTokenExchangeV2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ExternalInternalTokenExchangeV2Test.java index 3cf8e4d4bd6..dcac1f4fe44 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ExternalInternalTokenExchangeV2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/ExternalInternalTokenExchangeV2Test.java @@ -33,7 +33,7 @@ import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Form; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.admin.client.resource.IdentityProviderResource; @@ -61,17 +61,20 @@ import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.util.BasicAuthHelper; +import org.junit.Test; + +import static org.keycloak.broker.oidc.OAuth2IdentityProviderConfig.TOKEN_ENDPOINT_URL; +import static org.keycloak.broker.oidc.OAuth2IdentityProviderConfig.TOKEN_INTROSPECTION_URL; +import static org.keycloak.testsuite.broker.BrokerTestConstants.CLIENT_ID; +import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; +import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; +import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertEquals; -import static org.keycloak.broker.oidc.OAuth2IdentityProviderConfig.TOKEN_INTROSPECTION_URL; -import static org.keycloak.broker.oidc.OAuth2IdentityProviderConfig.TOKEN_ENDPOINT_URL; -import static org.keycloak.testsuite.broker.BrokerTestConstants.CLIENT_ID; -import static org.keycloak.testsuite.broker.BrokerTestConstants.IDP_OIDC_ALIAS; -import static org.keycloak.testsuite.broker.BrokerTestConstants.REALM_CONS_NAME; -import static org.keycloak.testsuite.broker.BrokerTestTools.getProviderRoot; /** * Test for external-internal token exchange using token_exchange_external_internal:v2 diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV1Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV1Test.java index a286d12847c..e916f0a12b3 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV1Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV1Test.java @@ -19,8 +19,11 @@ package org.keycloak.testsuite.oauth.tokenexchange; -import org.junit.Rule; -import org.junit.Test; +import java.util.Arrays; +import java.util.List; + +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.TokenVerifier; @@ -40,16 +43,16 @@ import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import jakarta.ws.rs.core.Response; -import java.util.Arrays; -import java.util.List; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; /** * Tests for standard token exchange (internal-internal) and token-exchange-v1 diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java index 524a3705a08..a523ec05e05 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2Test.java @@ -19,13 +19,13 @@ package org.keycloak.testsuite.oauth.tokenexchange; +import java.io.IOException; +import java.util.List; + import jakarta.ws.rs.NotAuthorizedException; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import org.hamcrest.MatcherAssert; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.TokenVerifier; @@ -67,21 +67,29 @@ import org.keycloak.testsuite.client.policies.AbstractClientPoliciesTest; import org.keycloak.testsuite.pages.ConsentPage; import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExceptionExecutorFactory; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; -import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.updaters.ProtocolMappersUpdater; +import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.updaters.RoleScopeUpdater; import org.keycloak.testsuite.updaters.UserAttributeUpdater; import org.keycloak.testsuite.util.ClientPoliciesUtil; import org.keycloak.testsuite.util.ServerURLs; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.util.oauth.UserInfoResponse; import org.keycloak.testsuite.util.oauth.TokenExchangeRequest; import org.keycloak.testsuite.util.oauth.TokenRevocationResponse; +import org.keycloak.testsuite.util.oauth.UserInfoResponse; import org.keycloak.testsuite.utils.tls.TLSUtils; import org.keycloak.util.TokenUtil; -import java.io.IOException; -import java.util.List; +import org.hamcrest.MatcherAssert; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createGrantTypeConditionConfig; +import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.Assert.assertEquals; @@ -90,11 +98,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createClientScopesConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createGrantTypeConditionConfig; -import static org.keycloak.testsuite.util.ClientPoliciesUtil.createTestRaiseExeptionExecutorConfig; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2WithLegacyTokenExchangeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2WithLegacyTokenExchangeTest.java index 60f283cdcde..24f1987972f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2WithLegacyTokenExchangeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/StandardTokenExchangeV2WithLegacyTokenExchangeTest.java @@ -20,7 +20,7 @@ package org.keycloak.testsuite.oauth.tokenexchange; import jakarta.ws.rs.core.Response; -import org.junit.Test; + import org.keycloak.OAuthErrorException; import org.keycloak.common.Profile; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; @@ -28,6 +28,8 @@ import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.junit.Test; + import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/SubjectImpersonationTokenExchangeV1Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/SubjectImpersonationTokenExchangeV1Test.java index cd32a645ad6..5de881b7536 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/SubjectImpersonationTokenExchangeV1Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/SubjectImpersonationTokenExchangeV1Test.java @@ -22,15 +22,13 @@ package org.keycloak.testsuite.oauth.tokenexchange; import java.util.List; import java.util.Map; -import com.fasterxml.jackson.databind.JsonNode; import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Form; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.TokenVerifier; import org.keycloak.common.Profile; @@ -49,12 +47,17 @@ import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.util.BasicAuthHelper; +import com.fasterxml.jackson.databind.JsonNode; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; /** * Tests for subject impersonation token exchange (including "direct naked impersonation") diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/TokenExchangeTestUtils.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/TokenExchangeTestUtils.java index 1d2d6bee603..4121bf2b414 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/TokenExchangeTestUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oauth/tokenexchange/TokenExchangeTestUtils.java @@ -41,11 +41,12 @@ import org.keycloak.services.resources.admin.fgap.AdminPermissionManagement; import org.keycloak.services.resources.admin.fgap.AdminPermissions; import org.keycloak.testsuite.util.oauth.OAuthClient; -import static org.junit.Assert.assertNotNull; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_ID; import static org.keycloak.models.ImpersonationSessionNote.IMPERSONATOR_USERNAME; import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; +import static org.junit.Assert.assertNotNull; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/OID4VCIWellKnownProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/OID4VCIWellKnownProviderTest.java index 23837301972..8ffa93bec0d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/OID4VCIWellKnownProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/OID4VCIWellKnownProviderTest.java @@ -16,7 +16,12 @@ */ package org.keycloak.testsuite.oid4vc.issuance; -import org.junit.Test; +import java.io.IOException; +import java.util.Base64; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.SecretGenerator; import org.keycloak.crypto.Algorithm; @@ -26,16 +31,13 @@ import org.keycloak.representations.idm.ComponentExportRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.oid4vc.issuance.signing.OID4VCTest; -import java.io.IOException; -import java.util.Base64; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import org.junit.Test; + +import static org.keycloak.common.crypto.CryptoConstants.A128KW; +import static org.keycloak.jose.jwe.JWEConstants.RSA_OAEP_256; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.keycloak.common.crypto.CryptoConstants.A128KW; -import static org.keycloak.jose.jwe.JWEConstants.RSA_OAEP_256; public class OID4VCIWellKnownProviderTest extends OID4VCTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/credentialbuilder/JwtCredentialBuilderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/credentialbuilder/JwtCredentialBuilderTest.java index 034730f6c47..e68c0db561b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/credentialbuilder/JwtCredentialBuilderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/credentialbuilder/JwtCredentialBuilderTest.java @@ -17,22 +17,23 @@ package org.keycloak.testsuite.oid4vc.issuance.credentialbuilder; -import com.fasterxml.jackson.databind.JsonNode; -import org.junit.Test; +import java.time.Instant; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import org.keycloak.constants.Oid4VciConstants; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; -import org.keycloak.constants.Oid4VciConstants; import org.keycloak.protocol.oid4vc.issuance.TimeProvider; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.JwtCredentialBody; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.JwtCredentialBuilder; import org.keycloak.protocol.oid4vc.model.CredentialBuildConfig; import org.keycloak.protocol.oid4vc.model.VerifiableCredential; -import java.time.Instant; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import com.fasterxml.jackson.databind.JsonNode; +import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilderTest.java index bb867461ee1..3f3403285e9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/credentialbuilder/SdJwtCredentialBuilderTest.java @@ -17,8 +17,10 @@ package org.keycloak.testsuite.oid4vc.issuance.credentialbuilder; -import com.fasterxml.jackson.databind.node.ArrayNode; -import org.junit.Test; +import java.util.List; +import java.util.Map; +import java.util.UUID; + import org.keycloak.common.VerificationException; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.SdJwtCredentialBody; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.SdJwtCredentialBuilder; @@ -28,17 +30,17 @@ import org.keycloak.sdjwt.IssuerSignedJWT; import org.keycloak.sdjwt.IssuerSignedJwtVerificationOpts; import org.keycloak.sdjwt.vp.SdJwtVP; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import com.fasterxml.jackson.databind.node.ArrayNode; +import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.keycloak.protocol.oid4vc.issuance.credentialbuilder.SdJwtCredentialBuilder.ISSUER_CLAIM; import static org.keycloak.protocol.oid4vc.issuance.credentialbuilder.SdJwtCredentialBuilder.VERIFIABLE_CREDENTIAL_TYPE_CLAIM; import static org.keycloak.sdjwt.IssuerSignedJWT.CLAIM_NAME_SD_HASH_ALGORITHM; import static org.keycloak.sdjwt.IssuerSignedJWT.CLAIM_NAME_SELECTIVE_DISCLOSURE; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * @author Ingrid Kamga */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/mappers/OID4VCTargetRoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/mappers/OID4VCTargetRoleMapperTest.java index 687fef7d68f..1e4c7695542 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/mappers/OID4VCTargetRoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/mappers/OID4VCTargetRoleMapperTest.java @@ -17,8 +17,14 @@ package org.keycloak.testsuite.oid4vc.issuance.mappers; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.oid4vc.issuance.mappers.OID4VCTargetRoleMapper; @@ -31,18 +37,14 @@ import org.keycloak.services.managers.AppAuthManager; import org.keycloak.testsuite.oid4vc.issuance.signing.OID4VCTest; import org.keycloak.testsuite.runonserver.RunOnServerException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.Test; + +import static org.keycloak.testsuite.forms.PassThroughClientAuthenticator.clientId; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.testsuite.forms.PassThroughClientAuthenticator.clientId; public class OID4VCTargetRoleMapperTest extends OID4VCTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/JWTVCIssuerWellKnownProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/JWTVCIssuerWellKnownProviderTest.java index c74ea43b296..b9473fca11b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/JWTVCIssuerWellKnownProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/JWTVCIssuerWellKnownProviderTest.java @@ -16,11 +16,16 @@ */ package org.keycloak.testsuite.oid4vc.issuance.signing; +import java.io.IOException; +import java.net.URI; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import org.junit.Test; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.jose.jwk.JSONWebKeySet; import org.keycloak.protocol.oid4vc.issuance.JWTVCIssuerWellKnownProviderFactory; @@ -31,14 +36,11 @@ import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.net.URI; -import java.util.List; -import java.util.Map; +import org.junit.Test; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/JwtCredentialSignerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/JwtCredentialSignerTest.java index 52342720ca2..44c2173508c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/JwtCredentialSignerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/JwtCredentialSignerTest.java @@ -17,9 +17,13 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import org.jboss.logging.Logger; -import org.junit.Before; -import org.junit.Test; +import java.security.PublicKey; +import java.time.Instant; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; + import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; import org.keycloak.common.crypto.CryptoIntegration; @@ -43,12 +47,9 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.runonserver.RunOnServerException; import org.keycloak.util.JsonSerialization; -import java.security.PublicKey; -import java.time.Instant; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; +import org.jboss.logging.Logger; +import org.junit.Before; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/LDCredentialSignerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/LDCredentialSignerTest.java index 79f748698ef..70b435f3257 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/LDCredentialSignerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/LDCredentialSignerTest.java @@ -17,8 +17,12 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import org.junit.Before; -import org.junit.Test; +import java.time.Instant; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; + import org.keycloak.common.crypto.CryptoIntegration; import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.crypto.KeyWrapper; @@ -37,11 +41,8 @@ import org.keycloak.protocol.oid4vc.model.vcdm.LdProof; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.runonserver.RunOnServerException; -import java.time.Instant; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; +import org.junit.Before; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/NonceEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/NonceEndpointTest.java index 4c8a8e6228f..24f4a8f6dca 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/NonceEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/NonceEndpointTest.java @@ -18,18 +18,19 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import jakarta.ws.rs.core.UriBuilder; -import org.junit.Assert; -import org.junit.Test; +import java.net.URI; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.client.Invocation; +import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.keycloak.protocol.oid4vc.model.NonceResponse; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.OAuth2Constants; -import org.keycloak.testsuite.util.AdminClientUtil; -import org.keycloak.util.JsonSerialization; import org.keycloak.TokenVerifier; import org.keycloak.crypto.Algorithm; import org.keycloak.jose.jws.JWSHeader; @@ -39,15 +40,16 @@ import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerEndpoint; import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvider; import org.keycloak.protocol.oid4vc.issuance.keybinding.CNonceHandler; import org.keycloak.protocol.oid4vc.issuance.keybinding.JwtCNonceHandler; +import org.keycloak.protocol.oid4vc.model.NonceResponse; import org.keycloak.representations.JsonWebToken; import org.keycloak.services.resources.RealmsResource; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; +import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.oauth.OAuthClient; +import org.keycloak.util.JsonSerialization; -import java.net.URI; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import org.junit.Assert; +import org.junit.Test; /** * @author Pascal Knüppel diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowTestBase.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowTestBase.java index 2a8586620ec..ee7dd839063 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowTestBase.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowTestBase.java @@ -17,7 +17,30 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.core.HttpHeaders; + +import org.keycloak.OAuth2Constants; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsResponse; +import org.keycloak.protocol.oid4vc.model.AuthorizationDetail; +import org.keycloak.protocol.oid4vc.model.ClaimsDescription; +import org.keycloak.protocol.oid4vc.model.CredentialIssuer; +import org.keycloak.protocol.oid4vc.model.CredentialRequest; +import org.keycloak.protocol.oid4vc.model.CredentialResponse; +import org.keycloak.protocol.oid4vc.model.CredentialsOffer; +import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; +import org.keycloak.representations.AccessTokenResponse; +import org.keycloak.representations.idm.ClientScopeRepresentation; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.type.TypeReference; import org.apache.commons.io.IOUtils; import org.apache.http.HttpStatus; import org.apache.http.NameValuePair; @@ -25,30 +48,9 @@ import org.apache.http.client.entity.UrlEncodedFormEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; import org.apache.http.message.BasicNameValuePair; import org.junit.Test; -import org.keycloak.OAuth2Constants; -import org.keycloak.protocol.oid4vc.model.AuthorizationDetail; -import org.keycloak.protocol.oid4vc.model.ClaimsDescription; -import org.keycloak.protocol.oid4vc.model.CredentialIssuer; -import org.keycloak.protocol.oid4vc.model.CredentialsOffer; -import org.keycloak.protocol.oid4vc.model.CredentialRequest; -import org.keycloak.protocol.oid4vc.model.CredentialResponse; -import org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsResponse; -import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; -import org.keycloak.representations.AccessTokenResponse; -import org.keycloak.util.JsonSerialization; -import com.fasterxml.jackson.core.type.TypeReference; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.apache.http.entity.StringEntity; -import org.keycloak.representations.idm.ClientScopeRepresentation; - -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowWithPARTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowWithPARTest.java index fa51c0ca416..c2463ef94de 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowWithPARTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowWithPARTest.java @@ -17,32 +17,6 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import jakarta.ws.rs.core.HttpHeaders; -import org.apache.commons.io.IOUtils; -import org.apache.http.HttpStatus; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Test; -import org.keycloak.OAuth2Constants; -import org.keycloak.protocol.oidc.OIDCLoginProtocol; -import org.keycloak.protocol.oid4vc.model.AuthorizationDetail; -import org.keycloak.protocol.oid4vc.model.ClaimsDescription; -import org.keycloak.protocol.oid4vc.model.CredentialIssuer; -import org.keycloak.protocol.oid4vc.model.CredentialRequest; -import org.keycloak.protocol.oid4vc.model.CredentialResponse; -import org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsResponse; -import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; -import org.keycloak.representations.AccessTokenResponse; -import org.keycloak.util.JsonSerialization; -import com.fasterxml.jackson.core.type.TypeReference; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.apache.http.entity.StringEntity; -import org.keycloak.representations.idm.ClientScopeRepresentation; - import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; @@ -51,12 +25,41 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import jakarta.ws.rs.core.HttpHeaders; + +import org.keycloak.OAuth2Constants; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsResponse; +import org.keycloak.protocol.oid4vc.model.AuthorizationDetail; +import org.keycloak.protocol.oid4vc.model.ClaimsDescription; +import org.keycloak.protocol.oid4vc.model.CredentialIssuer; +import org.keycloak.protocol.oid4vc.model.CredentialRequest; +import org.keycloak.protocol.oid4vc.model.CredentialResponse; +import org.keycloak.protocol.oidc.OIDCLoginProtocol; +import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; +import org.keycloak.representations.AccessTokenResponse; +import org.keycloak.representations.idm.ClientScopeRepresentation; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.commons.io.IOUtils; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Test; + +import static org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsProcessor.OPENID_CREDENTIAL_TYPE; + import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; -import static org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsProcessor.OPENID_CREDENTIAL_TYPE; /** * Test class for Authorization Code Flow with PAR (Pushed Authorization Request) containing authorization_details. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsFlowTestBase.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsFlowTestBase.java index 542f6ca884a..31a12eecaa9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsFlowTestBase.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsFlowTestBase.java @@ -17,33 +17,6 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import jakarta.ws.rs.core.HttpHeaders; -import org.apache.commons.io.IOUtils; -import org.apache.http.HttpStatus; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Test; -import org.keycloak.OAuth2Constants; -import org.keycloak.protocol.oid4vc.model.AuthorizationDetail; -import org.keycloak.protocol.oid4vc.model.ClaimsDescription; -import org.keycloak.protocol.oid4vc.model.CredentialIssuer; -import org.keycloak.protocol.oid4vc.model.CredentialOfferURI; -import org.keycloak.protocol.oid4vc.model.CredentialsOffer; -import org.keycloak.protocol.oid4vc.model.CredentialRequest; -import org.keycloak.protocol.oid4vc.model.CredentialResponse; -import org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsResponse; -import org.keycloak.protocol.oidc.grants.PreAuthorizedCodeGrantTypeFactory; -import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; -import org.keycloak.util.JsonSerialization; -import com.fasterxml.jackson.core.type.TypeReference; -import org.keycloak.models.oid4vci.CredentialScopeModel; -import org.apache.http.entity.StringEntity; -import org.keycloak.representations.idm.ClientScopeRepresentation; - import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; @@ -54,12 +27,42 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; +import jakarta.ws.rs.core.HttpHeaders; + +import org.keycloak.OAuth2Constants; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsResponse; +import org.keycloak.protocol.oid4vc.model.AuthorizationDetail; +import org.keycloak.protocol.oid4vc.model.ClaimsDescription; +import org.keycloak.protocol.oid4vc.model.CredentialIssuer; +import org.keycloak.protocol.oid4vc.model.CredentialOfferURI; +import org.keycloak.protocol.oid4vc.model.CredentialRequest; +import org.keycloak.protocol.oid4vc.model.CredentialResponse; +import org.keycloak.protocol.oid4vc.model.CredentialsOffer; +import org.keycloak.protocol.oidc.grants.PreAuthorizedCodeGrantTypeFactory; +import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; +import org.keycloak.representations.idm.ClientScopeRepresentation; +import org.keycloak.util.JsonSerialization; + +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.commons.io.IOUtils; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.StringEntity; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Test; + +import static org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsProcessor.OPENID_CREDENTIAL_TYPE; + import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; -import static org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsProcessor.OPENID_CREDENTIAL_TYPE; /** * Base class for authorization details flow tests. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsTypesSupportedTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsTypesSupportedTest.java index 6d3022a05e5..73f8d45642e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsTypesSupportedTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsTypesSupportedTest.java @@ -17,10 +17,11 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; +import java.util.List; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.core.Response; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.common.Profile; import org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsProcessor; import org.keycloak.protocol.oid4vc.model.CredentialIssuer; @@ -30,14 +31,16 @@ import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.oauth.OAuthClient; -import java.util.List; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsProcessor.OPENID_CREDENTIAL_TYPE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsProcessor.OPENID_CREDENTIAL_TYPE; /** * Test to verify that authorization_details_types_supported is included in the OAuth Authorization Server diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCCredentialOfferCorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCCredentialOfferCorsTest.java index 9ebfe844131..23f754485e1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCCredentialOfferCorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCCredentialOfferCorsTest.java @@ -17,7 +17,24 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; +import java.io.IOException; +import java.util.Arrays; +import java.util.Set; +import java.util.stream.Collectors; + import jakarta.ws.rs.core.HttpHeaders; + +import org.keycloak.common.Profile; +import org.keycloak.protocol.oid4vc.model.CredentialOfferURI; +import org.keycloak.protocol.oid4vc.model.CredentialsOffer; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.services.cors.Cors; +import org.keycloak.testsuite.AssertEvents; +import org.keycloak.testsuite.arquillian.annotation.EnableFeature; +import org.keycloak.testsuite.util.TokenUtil; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.util.JsonSerialization; + import org.apache.http.Header; import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; @@ -25,28 +42,13 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpOptions; import org.junit.Rule; import org.junit.Test; -import org.keycloak.protocol.oid4vc.model.CredentialOfferURI; -import org.keycloak.protocol.oid4vc.model.CredentialsOffer; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.services.cors.Cors; -import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; -import org.keycloak.testsuite.util.TokenUtil; -import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.Arrays; -import java.util.Set; -import java.util.stream.Collectors; +import static org.keycloak.testsuite.forms.PassThroughClientAuthenticator.clientId; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.forms.PassThroughClientAuthenticator.clientId; - -import org.keycloak.common.Profile; /** * Test class for CORS functionality on OID4VCI credential offer endpoints. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCGrantFeatureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCGrantFeatureTest.java index f4eafef1edb..fc42df955d1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCGrantFeatureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCGrantFeatureTest.java @@ -19,7 +19,6 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import org.junit.Test; import org.keycloak.common.Profile; import org.keycloak.protocol.oidc.grants.OAuth2GrantTypeSpi; import org.keycloak.protocol.oidc.grants.PreAuthorizedCodeGrantTypeFactory; @@ -27,6 +26,8 @@ import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.feature.AbstractFeatureStateTest; +import org.junit.Test; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java index ef6c4840755..4fad9572388 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java @@ -17,14 +17,18 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; +import java.io.IOException; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import org.apache.http.HttpStatus; -import org.jboss.logging.Logger; -import org.junit.Test; + import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; import org.keycloak.crypto.KeyUse; @@ -46,19 +50,18 @@ import org.keycloak.testsuite.Assert; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.MediaType; -import java.io.IOException; -import java.security.NoSuchAlgorithmException; -import java.security.PrivateKey; -import java.util.List; -import java.util.Map; +import org.apache.http.HttpStatus; +import org.jboss.logging.Logger; +import org.junit.Test; + +import static org.keycloak.jose.jwe.JWEConstants.A256GCM; +import static org.keycloak.protocol.oid4vc.model.ErrorType.INVALID_ENCRYPTION_PARAMETERS; +import static org.keycloak.utils.MediaType.APPLICATION_JWT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.jose.jwe.JWEConstants.A256GCM; -import static org.keycloak.protocol.oid4vc.model.ErrorType.INVALID_ENCRYPTION_PARAMETERS; -import static org.keycloak.utils.MediaType.APPLICATION_JWT; /** * Test class for Credential Request and Response Encryption @@ -532,4 +535,3 @@ public class OID4VCIssuerEndpointEncryptionTest extends OID4VCIssuerEndpointTest }); } } - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java index 9216b465459..3a55dca4a40 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java @@ -17,23 +17,33 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import com.fasterxml.jackson.core.type.TypeReference; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.interfaces.RSAPublicKey; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.BiConsumer; +import java.util.function.BiFunction; +import java.util.function.Consumer; +import java.util.zip.Deflater; +import java.util.zip.DeflaterOutputStream; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import org.apache.commons.io.IOUtils; -import org.apache.http.HttpStatus; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.jboss.logging.Logger; -import org.junit.Before; + import org.keycloak.TokenVerifier; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.RealmResource; @@ -53,15 +63,15 @@ import org.keycloak.jose.jwk.JWK; import org.keycloak.jose.jwk.RSAPublicJWK; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientScopeModel; -import org.keycloak.models.oid4vci.CredentialScopeModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserSessionModel; +import org.keycloak.models.oid4vci.CredentialScopeModel; +import org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsResponse; import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerEndpoint; import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProviderFactory; import org.keycloak.protocol.oid4vc.issuance.TimeProvider; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.CredentialBuilder; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.JwtCredentialBuilder; -import org.keycloak.protocol.oid4vc.issuance.OID4VCAuthorizationDetailsResponse; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.SdJwtCredentialBuilder; import org.keycloak.protocol.oid4vc.model.CredentialIssuer; import org.keycloak.protocol.oid4vc.model.CredentialRequest; @@ -90,32 +100,19 @@ import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.util.JsonSerialization; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; -import java.security.PrivateKey; -import java.security.interfaces.RSAPublicKey; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.function.BiConsumer; -import java.util.function.BiFunction; -import java.util.function.Consumer; -import java.util.zip.Deflater; -import java.util.zip.DeflaterOutputStream; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.commons.io.IOUtils; +import org.apache.http.HttpStatus; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.jboss.logging.Logger; +import org.junit.Before; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.keycloak.jose.jwe.JWEConstants.A256GCM; import static org.keycloak.jose.jwe.JWEConstants.RSA_OAEP; import static org.keycloak.jose.jwe.JWEConstants.RSA_OAEP_256; @@ -123,6 +120,12 @@ import static org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerEndpoint.CREDENT import static org.keycloak.protocol.oid4vc.model.ProofType.JWT; import static org.keycloak.testsuite.forms.PassThroughClientAuthenticator.clientId; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Moved test to subclass. so we can reuse initialization code. */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerWellKnownProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerWellKnownProviderTest.java index f2618295b6b..89501f6507f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerWellKnownProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerWellKnownProviderTest.java @@ -17,25 +17,25 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; +import java.io.IOException; +import java.io.Serializable; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import org.apache.http.Header; -import org.apache.http.HttpHeaders; -import org.apache.http.HttpStatus; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.util.EntityUtils; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Test; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.common.util.Time; +import org.keycloak.constants.Oid4VciConstants; import org.keycloak.crypto.Algorithm; import org.keycloak.crypto.KeyUse; import org.keycloak.crypto.KeyWrapper; @@ -45,10 +45,10 @@ import org.keycloak.jose.jwk.JWK; import org.keycloak.jose.jws.JWSHeader; import org.keycloak.jose.jws.JWSInput; import org.keycloak.models.KeycloakSession; +import org.keycloak.models.ProtocolMapperModel; import org.keycloak.models.RealmModel; import org.keycloak.models.oid4vci.CredentialScopeModel; import org.keycloak.models.oid4vci.Oid4vcProtocolMapperModel; -import org.keycloak.models.ProtocolMapperModel; import org.keycloak.protocol.ProtocolMapper; import org.keycloak.protocol.oid4vc.OID4VCLoginProtocolFactory; import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerEndpoint; @@ -77,24 +77,21 @@ import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.MediaType; import org.keycloak.utils.StringUtil; -import org.keycloak.constants.Oid4VciConstants; -import java.io.IOException; -import java.io.Serializable; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.http.Header; +import org.apache.http.HttpHeaders; +import org.apache.http.HttpStatus; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.apache.http.util.EntityUtils; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import static org.keycloak.constants.Oid4VciConstants.SIGNED_METADATA_JWT_TYPE; import static org.keycloak.jose.jwe.JWEConstants.A256GCM; import static org.keycloak.jose.jwe.JWEConstants.RSA_OAEP; @@ -103,6 +100,12 @@ import static org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvide import static org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvider.ATTR_REQUEST_ZIP_ALGS; import static org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvider.DEFLATE_COMPRESSION; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class OID4VCIssuerWellKnownProviderTest extends OID4VCIssuerEndpointTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointDisabledTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointDisabledTest.java index b3295a6944c..075ddf7f96e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointDisabledTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointDisabledTest.java @@ -1,8 +1,9 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import com.fasterxml.jackson.core.JsonProcessingException; +import java.util.function.Consumer; + import jakarta.ws.rs.core.Response; -import org.junit.Test; + import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerEndpoint; import org.keycloak.protocol.oid4vc.model.CredentialRequest; import org.keycloak.protocol.oid4vc.model.OfferUriType; @@ -11,7 +12,8 @@ import org.keycloak.services.managers.AppAuthManager; import org.keycloak.testsuite.Assert; import org.keycloak.util.JsonSerialization; -import java.util.function.Consumer; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointTest.java index 8d7ecd8cb0c..24e79d3099c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointTest.java @@ -16,22 +16,22 @@ */ package org.keycloak.testsuite.oid4vc.issuance.signing; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.function.BiFunction; +import java.util.function.Consumer; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.apache.commons.io.IOUtils; -import org.apache.http.HttpStatus; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; @@ -50,10 +50,10 @@ import org.keycloak.protocol.oid4vc.model.CredentialsOffer; import org.keycloak.protocol.oid4vc.model.ErrorResponse; import org.keycloak.protocol.oid4vc.model.ErrorType; import org.keycloak.protocol.oid4vc.model.Format; +import org.keycloak.protocol.oid4vc.model.JwtProof; import org.keycloak.protocol.oid4vc.model.OfferUriType; import org.keycloak.protocol.oid4vc.model.PreAuthorizedCode; import org.keycloak.protocol.oid4vc.model.PreAuthorizedGrant; -import org.keycloak.protocol.oid4vc.model.JwtProof; import org.keycloak.protocol.oid4vc.model.Proofs; import org.keycloak.protocol.oid4vc.model.SupportedCredentialConfiguration; import org.keycloak.protocol.oid4vc.model.VerifiableCredential; @@ -66,14 +66,16 @@ import org.keycloak.services.managers.AppAuthManager; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Arrays; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.function.BiFunction; -import java.util.function.Consumer; +import org.apache.commons.io.IOUtils; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Assert; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCKeyAttestationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCKeyAttestationTest.java index c43b839bbcd..d04badb1e27 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCKeyAttestationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCKeyAttestationTest.java @@ -17,10 +17,17 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import org.jboss.logging.Logger; -import org.junit.Test; -import org.keycloak.common.util.CertificateUtils; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.KeyStore; +import java.security.cert.X509Certificate; +import java.security.spec.ECGenParameterSpec; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import javax.net.ssl.TrustManagerFactory; +import org.keycloak.common.util.CertificateUtils; import org.keycloak.crypto.ECDSASignatureSignerContext; import org.keycloak.crypto.KeyType; import org.keycloak.crypto.KeyWrapper; @@ -42,22 +49,16 @@ import org.keycloak.protocol.oid4vc.model.KeyAttestationJwtBody; import org.keycloak.protocol.oid4vc.model.KeyAttestationsRequired; import org.keycloak.protocol.oid4vc.model.Proofs; -import javax.net.ssl.TrustManagerFactory; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.KeyStore; -import java.security.cert.X509Certificate; -import java.security.spec.ECGenParameterSpec; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.jboss.logging.Logger; +import org.junit.Test; + +import static org.keycloak.protocol.oid4vc.model.ProofType.JWT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import static org.keycloak.protocol.oid4vc.model.ProofType.JWT; /** * @author Bertrand Ogen diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointDisabledTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointDisabledTest.java index 3bb284ad7e2..3fb9c470ed4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointDisabledTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointDisabledTest.java @@ -1,8 +1,9 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import com.fasterxml.jackson.core.JsonProcessingException; +import java.util.function.Consumer; + import jakarta.ws.rs.core.Response; -import org.junit.Test; + import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerEndpoint; import org.keycloak.protocol.oid4vc.model.CredentialRequest; import org.keycloak.protocol.oid4vc.model.OfferUriType; @@ -11,7 +12,8 @@ import org.keycloak.services.managers.AppAuthManager; import org.keycloak.testsuite.Assert; import org.keycloak.util.JsonSerialization; -import java.util.function.Consumer; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointTest.java index dbcd2db1018..750fdcfa0ff 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointTest.java @@ -16,29 +16,27 @@ */ package org.keycloak.testsuite.oid4vc.issuance.signing; -import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.stream.Collectors; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.Response; -import org.apache.commons.io.IOUtils; -import org.apache.http.HttpStatus; -import org.apache.http.NameValuePair; -import org.apache.http.client.entity.UrlEncodedFormEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.message.BasicNameValuePair; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; import org.keycloak.common.util.Base64Url; +import org.keycloak.constants.Oid4VciConstants; import org.keycloak.models.ClientScopeModel; -import org.keycloak.models.oid4vci.CredentialScopeModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; -import org.keycloak.constants.Oid4VciConstants; +import org.keycloak.models.oid4vci.CredentialScopeModel; import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerEndpoint; import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvider; import org.keycloak.protocol.oid4vc.issuance.credentialbuilder.JwtCredentialBuilder; @@ -50,11 +48,11 @@ import org.keycloak.protocol.oid4vc.model.Claim; import org.keycloak.protocol.oid4vc.model.Claims; import org.keycloak.protocol.oid4vc.model.CredentialIssuer; import org.keycloak.protocol.oid4vc.model.CredentialOfferURI; +import org.keycloak.protocol.oid4vc.model.CredentialRequest; import org.keycloak.protocol.oid4vc.model.CredentialResponse; import org.keycloak.protocol.oid4vc.model.CredentialsOffer; import org.keycloak.protocol.oid4vc.model.Format; import org.keycloak.protocol.oid4vc.model.Proofs; -import org.keycloak.protocol.oid4vc.model.CredentialRequest; import org.keycloak.protocol.oid4vc.model.SupportedCredentialConfiguration; import org.keycloak.protocol.oidc.grants.PreAuthorizedCodeGrantTypeFactory; import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; @@ -66,15 +64,19 @@ import org.keycloak.sdjwt.vp.SdJwtVP; import org.keycloak.services.managers.AppAuthManager; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.util.JsonSerialization; -import org.testcontainers.shaded.org.apache.commons.lang3.exception.ExceptionUtils; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.stream.Collectors; +import com.fasterxml.jackson.databind.JsonNode; +import org.apache.commons.io.IOUtils; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; +import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.message.BasicNameValuePair; +import org.junit.Assert; +import org.junit.Test; +import org.testcontainers.shaded.org.apache.commons.lang3.exception.ExceptionUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtPreInstalledNaturalPersonTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtPreInstalledNaturalPersonTest.java index 990cd91e2d4..749686ab44b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtPreInstalledNaturalPersonTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtPreInstalledNaturalPersonTest.java @@ -16,19 +16,21 @@ */ package org.keycloak.testsuite.oid4vc.issuance.signing; -import org.junit.Test; +import java.util.function.Function; +import java.util.stream.Collectors; + import org.keycloak.protocol.oid4vc.issuance.OID4VCIssuerWellKnownProvider; import org.keycloak.protocol.oid4vc.model.Claim; import org.keycloak.protocol.oid4vc.model.Format; + +import org.junit.Test; import org.slf4j.LoggerFactory; -import java.util.function.Function; -import java.util.stream.Collectors; +import static org.keycloak.models.oid4vci.CredentialScopeModel.CONFIGURATION_ID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; -import static org.keycloak.models.oid4vci.CredentialScopeModel.CONFIGURATION_ID; /** * OID4VCI testing for the pre-installed oid4vc_natural_person diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTest.java index f6cc896a417..cd2aeabc008 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTest.java @@ -17,18 +17,34 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; +import java.io.IOException; +import java.net.URI; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.NoSuchProviderException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.Security; +import java.security.cert.Certificate; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.UUID; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.Invocation; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; -import com.fasterxml.jackson.core.type.TypeReference; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import org.apache.http.HttpStatus; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.jboss.logging.Logger; -import org.junit.Assert; + import org.keycloak.admin.client.resource.ClientScopeResource; import org.keycloak.admin.client.resource.ProtocolMappersResource; import org.keycloak.common.Profile; @@ -60,8 +76,8 @@ import org.keycloak.protocol.oid4vc.model.Format; import org.keycloak.protocol.oid4vc.model.ISO18045ResistanceLevel; import org.keycloak.protocol.oid4vc.model.KeyAttestationJwtBody; import org.keycloak.protocol.oid4vc.model.NonceResponse; -import org.keycloak.protocol.oid4vc.model.SupportedCredentialConfiguration; import org.keycloak.protocol.oid4vc.model.ProofTypesSupported; +import org.keycloak.protocol.oid4vc.model.SupportedCredentialConfiguration; import org.keycloak.protocol.oid4vc.model.VerifiableCredential; import org.keycloak.representations.AccessToken; import org.keycloak.representations.idm.ClientRepresentation; @@ -79,25 +95,11 @@ import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.net.URI; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.security.Security; -import java.security.cert.Certificate; -import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.UUID; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.http.HttpStatus; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.jboss.logging.Logger; +import org.junit.Assert; import static org.keycloak.testsuite.oid4vc.issuance.signing.OID4VCIssuerEndpointTest.TIME_PROVIDER; import static org.keycloak.testsuite.oid4vc.issuance.signing.OID4VCSdJwtIssuingEndpointTest.getCredentialIssuer; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/SdJwtCredentialSignerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/SdJwtCredentialSignerTest.java index 1453c90a0d1..e3f0e4a0a67 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/SdJwtCredentialSignerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/SdJwtCredentialSignerTest.java @@ -17,8 +17,14 @@ package org.keycloak.testsuite.oid4vc.issuance.signing; -import com.fasterxml.jackson.core.JsonProcessingException; -import org.junit.Test; +import java.security.PublicKey; +import java.util.Arrays; +import java.util.Base64; +import java.util.List; +import java.util.Map; +import java.util.StringJoiner; +import java.util.UUID; + import org.keycloak.TokenVerifier; import org.keycloak.common.VerificationException; import org.keycloak.common.util.MultivaluedHashMap; @@ -42,13 +48,8 @@ import org.keycloak.sdjwt.SdJwtUtils; import org.keycloak.testsuite.runonserver.RunOnServerException; import org.keycloak.util.JsonSerialization; -import java.security.PublicKey; -import java.util.Arrays; -import java.util.Base64; -import java.util.List; -import java.util.Map; -import java.util.StringJoiner; -import java.util.UUID; +import com.fasterxml.jackson.core.JsonProcessingException; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractOIDCScopeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractOIDCScopeTest.java index c7193c0b634..cc1afda9df0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractOIDCScopeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractOIDCScopeTest.java @@ -20,8 +20,6 @@ package org.keycloak.testsuite.oidc; import java.util.Arrays; import java.util.Collection; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Rule; import org.keycloak.events.Details; import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; @@ -35,6 +33,9 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Rule; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractWellKnownProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractWellKnownProviderTest.java index 6b025a38302..07b790b4e98 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractWellKnownProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AbstractWellKnownProviderTest.java @@ -16,19 +16,20 @@ */ package org.keycloak.testsuite.oidc; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.net.URI; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.Invocation; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.junit.After; -import org.junit.Before; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.runners.MethodSorters; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.constants.ServiceAccountConstants; @@ -51,35 +52,38 @@ import org.keycloak.services.clientregistration.ClientRegistrationService; import org.keycloak.services.clientregistration.oidc.OIDCClientRegistrationProviderFactory; import org.keycloak.services.cors.Cors; import org.keycloak.services.resources.RealmsResource; +import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; -import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.forms.BrowserFlowTest; import org.keycloak.testsuite.forms.LevelOfAssuranceFlowTest; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ClientManager; +import org.keycloak.testsuite.util.TokenSignatureUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.TokenSignatureUtil; import org.keycloak.testsuite.wellknown.CustomOIDCWellKnownProviderFactory; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.net.URI; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.junit.After; +import org.junit.Before; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; import static jakarta.ws.rs.core.HttpHeaders.ACCEPT; import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; + +import static org.keycloak.utils.MediaType.APPLICATION_JWKS; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.keycloak.utils.MediaType.APPLICATION_JWKS; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class AbstractWellKnownProviderTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java index 5891b2dda5e..fd039e98f3b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AcrAuthFlowTest.java @@ -18,11 +18,13 @@ package org.keycloak.testsuite.oidc; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.Assert; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.admin.client.Keycloak; import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; @@ -53,12 +55,11 @@ import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; /** * @author Giuseppe Graziano diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java index 605660132b3..c7df1623802 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AudienceTest.java @@ -17,8 +17,12 @@ package org.keycloak.testsuite.oidc; -import org.junit.Before; -import org.junit.Test; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientScopeResource; import org.keycloak.models.utils.KeycloakModelUtils; @@ -36,10 +40,8 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.ProtocolMapperUtil; import org.keycloak.testsuite.util.UserBuilder; -import jakarta.ws.rs.core.Response; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; +import org.junit.Before; +import org.junit.Test; /** * Test for the 'aud' claim in tokens diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthenticationMethodReferenceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthenticationMethodReferenceTest.java index 42872f44ef7..4d0ba9e0638 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthenticationMethodReferenceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthenticationMethodReferenceTest.java @@ -17,10 +17,14 @@ package org.keycloak.testsuite.oidc; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import org.keycloak.authentication.authenticators.browser.OTPFormAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; import org.keycloak.authentication.authenticators.conditional.ConditionalLoaAuthenticator; @@ -48,13 +52,10 @@ import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; /** * @author Ben Cresitello-Dittmar diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenEncryptionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenEncryptionTest.java index b2b6ea68c42..25caa9804b8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenEncryptionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenEncryptionTest.java @@ -16,9 +16,13 @@ */ package org.keycloak.testsuite.oidc; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.security.PrivateKey; +import java.util.Map; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.PemUtils; @@ -47,17 +51,14 @@ import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.OAuthGrantPage; -import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.TokenSignatureUtil; +import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; -import java.io.IOException; -import java.net.MalformedURLException; -import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; -import java.security.PrivateKey; -import java.util.Map; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Rule; +import org.junit.Test; public class AuthorizationTokenEncryptionTest extends AbstractTestRealmKeycloakTest { @@ -300,4 +301,3 @@ public class AuthorizationTokenEncryptionTest extends AbstractTestRealmKeycloakT } } - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenResponseModeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenResponseModeTest.java index edd3c1212f0..d462b828ea2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenResponseModeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/AuthorizationTokenResponseModeTest.java @@ -16,9 +16,9 @@ */ package org.keycloak.testsuite.oidc; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.net.URI; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.events.Details; @@ -32,10 +32,11 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import org.openqa.selenium.By; -import java.io.IOException; -import java.net.URI; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.openqa.selenium.By; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/IdTokenEncryptionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/IdTokenEncryptionTest.java index 95dcca97a3e..d52302c4883 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/IdTokenEncryptionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/IdTokenEncryptionTest.java @@ -16,10 +16,12 @@ */ package org.keycloak.testsuite.oidc; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.security.PrivateKey; +import java.util.List; +import java.util.Map; + import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.common.util.Base64Url; @@ -38,10 +40,10 @@ import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; import org.keycloak.representations.IDToken; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; @@ -51,17 +53,16 @@ import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.TokenSignatureUtil; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.security.PrivateKey; -import java.util.List; -import java.util.Map; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; public class IdTokenEncryptionTest extends AbstractTestRealmKeycloakTest { @@ -333,4 +334,3 @@ public class IdTokenEncryptionTest extends AbstractTestRealmKeycloakTest { } } - diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/LightWeightAccessTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/LightWeightAccessTokenTest.java index 1fddf74eddb..053e072ed1d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/LightWeightAccessTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/LightWeightAccessTokenTest.java @@ -17,19 +17,17 @@ package org.keycloak.testsuite.oidc; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.jboss.logging.Logger; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientScopeResource; import org.keycloak.admin.client.resource.ProtocolMappersResource; @@ -49,8 +47,8 @@ import org.keycloak.protocol.oidc.mappers.HardcodedRole; import org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper; import org.keycloak.protocol.oidc.mappers.RoleNameMapper; import org.keycloak.protocol.oidc.mappers.SHA256PairwiseSubMapper; -import org.keycloak.protocol.oidc.mappers.UserSessionNoteMapper; import org.keycloak.protocol.oidc.mappers.SessionStateMapper; +import org.keycloak.protocol.oidc.mappers.UserSessionNoteMapper; import org.keycloak.representations.AccessToken; import org.keycloak.representations.IDToken; import org.keycloak.representations.idm.ClientRepresentation; @@ -62,23 +60,28 @@ import org.keycloak.services.clientpolicy.executor.UseLightweightAccessTokenExec import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.client.policies.AbstractClientPoliciesTest; +import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.ClientPoliciesUtil; import org.keycloak.testsuite.util.KeycloakModelUtils; +import org.keycloak.testsuite.util.ProtocolMapperUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.ProtocolMapperUtil; import org.keycloak.testsuite.util.oauth.PkceGenerator; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.jboss.logging.Logger; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import static org.keycloak.protocol.ProtocolMapperUtils.USER_SESSION_NOTE; import static org.keycloak.protocol.oidc.OIDCLoginProtocolFactory.ACR; @@ -107,7 +110,6 @@ import static org.keycloak.protocol.oidc.mappers.PairwiseSubMapperHelper.PAIRWIS import static org.keycloak.protocol.oidc.mappers.RoleNameMapper.NEW_ROLE_NAME; import static org.keycloak.protocol.oidc.mappers.RoleNameMapper.ROLE_CONFIG; import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import static org.keycloak.testsuite.util.ClientPoliciesUtil.createAnyClientConditionConfig; public class LightWeightAccessTokenTest extends AbstractClientPoliciesTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/NonceBackwardsCompatibleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/NonceBackwardsCompatibleMapperTest.java index bfbe4952305..d3c1aa70110 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/NonceBackwardsCompatibleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/NonceBackwardsCompatibleMapperTest.java @@ -17,11 +17,10 @@ package org.keycloak.testsuite.oidc; -import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; + import jakarta.ws.rs.core.Response; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.events.Details; @@ -47,7 +46,10 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.util.TokenUtil; -import java.io.IOException; +import com.fasterxml.jackson.databind.JsonNode; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java index f0064a418a4..adba97a7135 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCAdvancedRequestParamsTest.java @@ -17,13 +17,17 @@ package org.keycloak.testsuite.oidc; -import com.google.common.collect.ImmutableMap; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.security.PublicKey; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -67,10 +71,10 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.KeysMetadataRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.util.CertificateInfoHelper; +import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; @@ -81,37 +85,35 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.pages.RegisterPage; import org.keycloak.testsuite.rest.resource.TestingOIDCEndpointsApplicationResource; +import org.keycloak.testsuite.util.AdminClientUtil; +import org.keycloak.testsuite.util.ClientManager; +import org.keycloak.testsuite.util.KeyUtils; +import org.keycloak.testsuite.util.UserInfoClientUtil; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.util.JWKSUtils; import org.keycloak.util.JsonSerialization; -import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.AdminClientUtil; -import org.keycloak.testsuite.util.UserInfoClientUtil; -import org.keycloak.testsuite.util.KeyUtils; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.core.Response; +import com.google.common.collect.ImmutableMap; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; -import java.io.IOException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.security.PublicKey; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.keycloak.jose.jwe.JWEConstants.RSA_OAEP; import static org.keycloak.jose.jwe.JWEConstants.RSA_OAEP_256; import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * Test for supporting advanced parameters of OIDC specs (max_age, prompt, ...) * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java index 514b09c10c3..14d6155d969 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCBackwardsCompatibilityTest.java @@ -17,14 +17,8 @@ package org.keycloak.testsuite.oidc; -import static org.junit.Assert.assertTrue; - import java.io.IOException; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.events.Details; @@ -44,6 +38,13 @@ import org.keycloak.testsuite.pages.OAuthGrantPage; import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.junit.Assert.assertTrue; + /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java index 915ceeca060..103195e51c3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCDynamicScopeTest.java @@ -17,8 +17,12 @@ */ package org.keycloak.testsuite.oidc; -import org.junit.Before; -import org.junit.Test; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.common.Profile; import org.keycloak.events.Details; @@ -37,10 +41,8 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.util.UserBuilder; -import jakarta.ws.rs.core.Response; -import java.util.HashMap; -import java.util.List; -import java.util.stream.Collectors; +import org.junit.Before; +import org.junit.Test; import static org.keycloak.common.Profile.Feature.DYNAMIC_SCOPES; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCPublicClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCPublicClientTest.java index ea724ac98ad..aa41cecba18 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCPublicClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCPublicClientTest.java @@ -18,10 +18,8 @@ package org.keycloak.testsuite.oidc; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.util.List; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.authentication.authenticators.client.JWTClientAuthenticator; import org.keycloak.events.Details; @@ -34,11 +32,15 @@ import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.util.ClientManager; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import java.util.List; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java index 3dbdb3843a9..63389c1ea52 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/OIDCScopeTest.java @@ -17,9 +17,14 @@ package org.keycloak.testsuite.oidc; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientScopeResource; @@ -43,21 +48,19 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.OAuthGrantPage; +import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.ClientManager; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.UserBuilder; -import org.keycloak.testsuite.util.AccountHelper; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.auth.page.AuthRealm.TEST; /** * Test for OAuth2 'scope' parameter and for some other aspects of client scopes diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java index 1948df1f05e..6a07e1a2331 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/UserInfoTest.java @@ -16,12 +16,25 @@ */ package org.keycloak.testsuite.oidc; -import org.hamcrest.CoreMatchers; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.ClientResource; @@ -48,33 +61,33 @@ import org.keycloak.jose.jwe.enc.JWEEncryptionProvider; import org.keycloak.jose.jws.JWSInput; import org.keycloak.jose.jws.JWSInputException; import org.keycloak.jose.jws.crypto.RSAProvider; +import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; import org.keycloak.protocol.oidc.OIDCLoginProtocol; +import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.protocol.oidc.utils.OIDCResponseType; import org.keycloak.representations.AccessToken; -import org.keycloak.representations.JsonWebToken; -import org.keycloak.representations.idm.ClientScopeRepresentation; -import org.keycloak.representations.idm.ProtocolMapperRepresentation; -import org.keycloak.representations.idm.RoleRepresentation; -import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; -import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; -import org.keycloak.testsuite.pages.LoginPage; -import org.keycloak.testsuite.updaters.ClientAttributeUpdater; -import org.keycloak.testsuite.util.KeyUtils; -import org.keycloak.testsuite.util.KeycloakModelUtils; -import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; -import org.keycloak.protocol.oidc.OIDCLoginProtocolService; import org.keycloak.representations.AccessTokenResponse; +import org.keycloak.representations.JsonWebToken; import org.keycloak.representations.UserInfo; import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.ClientScopeRepresentation; +import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.services.Urls; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.client.resources.TestApplicationResourceUrls; +import org.keycloak.testsuite.client.resources.TestOIDCEndpointsApplicationResource; +import org.keycloak.testsuite.pages.LoginPage; +import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.ClientManager; +import org.keycloak.testsuite.util.KeyUtils; +import org.keycloak.testsuite.util.KeycloakModelUtils; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.RoleBuilder; import org.keycloak.testsuite.util.TokenSignatureUtil; @@ -85,32 +98,22 @@ import org.keycloak.util.JsonSerialization; import org.keycloak.util.TokenUtil; import org.keycloak.utils.MediaType; -import jakarta.ws.rs.client.Client; -import jakarta.ws.rs.client.Entity; -import jakarta.ws.rs.client.WebTarget; -import jakarta.ws.rs.core.Form; -import jakarta.ws.rs.core.HttpHeaders; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; -import jakarta.ws.rs.core.UriBuilder; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.security.PrivateKey; -import java.security.PublicKey; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Map; +import org.hamcrest.CoreMatchers; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import static org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper.INCLUDE_IN_USERINFO; +import static org.keycloak.testsuite.AbstractAdminTest.loadJson; +import static org.keycloak.testsuite.AbstractTestRealmKeycloakTest.TEST_REALM_NAME; +import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.protocol.oidc.mappers.OIDCAttributeMapperHelper.INCLUDE_IN_USERINFO; -import static org.keycloak.testsuite.AbstractTestRealmKeycloakTest.TEST_REALM_NAME; -import static org.keycloak.testsuite.AbstractAdminTest.loadJson; -import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; /** * @author pedroigor diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java index 1bf0905d956..d11581c518c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/AbstractOIDCResponseTypeTest.java @@ -17,9 +17,9 @@ package org.keycloak.testsuite.oidc.flows; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.util.List; + import org.keycloak.OAuthErrorException; import org.keycloak.crypto.Algorithm; import org.keycloak.events.Details; @@ -30,20 +30,21 @@ import org.keycloak.jose.jws.crypto.HashUtils; import org.keycloak.representations.IDToken; import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.util.ClientManager; +import org.keycloak.testsuite.util.TokenSignatureUtil; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; -import org.keycloak.testsuite.util.TokenSignatureUtil; -import java.io.IOException; -import java.util.List; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Rule; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeCodeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeCodeTest.java index 0769f691477..00066f0455a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeCodeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeCodeTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.oidc.flows; -import org.junit.Before; -import org.junit.Test; +import java.util.Collections; +import java.util.List; + import org.keycloak.events.Details; import org.keycloak.protocol.oidc.utils.OIDCResponseType; import org.keycloak.representations.IDToken; @@ -27,8 +28,8 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.Collections; -import java.util.List; +import org.junit.Before; +import org.junit.Test; /** * Test for response_type=code diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeNoneTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeNoneTest.java index 114330806ba..94f9bb7c390 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeNoneTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCBasicResponseTypeNoneTest.java @@ -17,7 +17,9 @@ package org.keycloak.testsuite.oidc.flows; -import org.junit.Before; +import java.util.Collections; +import java.util.List; + import org.keycloak.events.Details; import org.keycloak.protocol.oidc.utils.OIDCResponseType; import org.keycloak.representations.IDToken; @@ -25,8 +27,7 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.Collections; -import java.util.List; +import org.junit.Before; /** * Test for response_type=none diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTest.java index 1969f734f5c..b40943a666a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.oidc.flows; -import org.junit.Before; -import org.junit.Test; +import java.util.Arrays; +import java.util.List; + import org.keycloak.events.Details; import org.keycloak.jose.jws.crypto.HashUtils; import org.keycloak.protocol.oidc.OIDCConfigAttributes; @@ -28,8 +29,8 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.Arrays; -import java.util.List; +import org.junit.Before; +import org.junit.Test; /** * Tests with response_type=code id_token as detached signature diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTokenTest.java index 659be080e54..fa5be38deae 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenAsDetachedSigTokenTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.oidc.flows; -import org.junit.Before; -import org.junit.Test; +import java.util.Arrays; +import java.util.List; + import org.keycloak.events.Details; import org.keycloak.jose.jws.crypto.HashUtils; import org.keycloak.protocol.oidc.OIDCConfigAttributes; @@ -28,8 +29,8 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.Arrays; -import java.util.List; +import org.junit.Before; +import org.junit.Test; /** * Tests with response_type=code id_token token as detached signature diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTest.java index af0953bcecc..93859298cd3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.oidc.flows; -import org.junit.Before; -import org.junit.Test; +import java.util.Arrays; +import java.util.List; + import org.keycloak.events.Details; import org.keycloak.jose.jws.crypto.HashUtils; import org.keycloak.protocol.oidc.utils.OIDCResponseType; @@ -27,8 +28,8 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.Arrays; -import java.util.List; +import org.junit.Before; +import org.junit.Test; /** * Tests with response_type=code id_token diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTokenTest.java index c88d6e807e5..de0c5ee7c38 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeIDTokenTokenTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.oidc.flows; -import org.junit.Before; -import org.junit.Test; +import java.util.Arrays; +import java.util.List; + import org.keycloak.events.Details; import org.keycloak.jose.jws.crypto.HashUtils; import org.keycloak.protocol.oidc.utils.OIDCResponseType; @@ -27,8 +28,8 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.Arrays; -import java.util.List; +import org.junit.Before; +import org.junit.Test; /** * Tests with response_type=code id_token token diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeTokenTest.java index 25cf9215c33..ff9d2e1eece 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCHybridResponseTypeCodeTokenTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.oidc.flows; -import org.junit.Before; -import org.junit.Test; +import java.util.Collections; +import java.util.List; + import org.keycloak.events.Details; import org.keycloak.protocol.oidc.utils.OIDCResponseType; import org.keycloak.representations.IDToken; @@ -27,8 +28,8 @@ import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.Collections; -import java.util.List; +import org.junit.Before; +import org.junit.Test; /** * Tests with response_type=code token diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTest.java index cb81f57ecaf..2626c375ac0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.oidc.flows; -import org.junit.Before; -import org.junit.Test; +import java.util.Collections; +import java.util.List; + import org.keycloak.events.Details; import org.keycloak.protocol.oidc.utils.OIDCResponseType; import org.keycloak.representations.IDToken; @@ -26,8 +27,8 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.Collections; -import java.util.List; +import org.junit.Before; +import org.junit.Test; /** * Tests with response_type=id_token diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTokenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTokenTest.java index d18b397cf55..86e041f0a87 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTokenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oidc/flows/OIDCImplicitResponseTypeIDTokenTokenTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.oidc.flows; -import org.junit.Before; -import org.junit.Test; +import java.util.Collections; +import java.util.List; + import org.keycloak.events.Details; import org.keycloak.protocol.oidc.utils.OIDCResponseType; import org.keycloak.representations.IDToken; @@ -26,8 +27,8 @@ import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.util.Collections; -import java.util.List; +import org.junit.Before; +import org.junit.Test; /** * Tests with response_type=id_token token diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/account/OrganizationAccountTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/account/OrganizationAccountTest.java index 3fb0784aa16..3f6f3c3e09e 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/account/OrganizationAccountTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/account/OrganizationAccountTest.java @@ -17,15 +17,12 @@ package org.keycloak.testsuite.organization.account; -import com.fasterxml.jackson.core.type.TypeReference; +import java.io.IOException; +import java.util.List; +import java.util.SortedSet; + import jakarta.ws.rs.core.Response.Status; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.OrganizationResource; import org.keycloak.http.simple.SimpleHttpResponse; import org.keycloak.representations.account.LinkedAccountRepresentation; @@ -39,9 +36,14 @@ import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; import org.keycloak.testsuite.util.TokenUtil; import org.keycloak.testsuite.util.UserBuilder; -import java.io.IOException; -import java.util.List; -import java.util.SortedSet; +import com.fasterxml.jackson.core.type.TypeReference; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; public class OrganizationAccountTest extends AbstractOrganizationTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/AbstractOrganizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/AbstractOrganizationTest.java index 08a9f9cb00b..c7ae9045d13 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/AbstractOrganizationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/AbstractOrganizationTest.java @@ -17,36 +17,27 @@ package org.keycloak.testsuite.organization.admin; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; - import java.util.List; import java.util.Map; import java.util.function.Function; + import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; + import org.keycloak.admin.client.resource.OrganizationResource; -import org.keycloak.models.OrganizationModel; -import org.keycloak.admin.client.resource.UsersResource; -import org.keycloak.models.OrganizationModel.IdentityProviderRedirectMode; -import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.admin.client.resource.UsersResource; +import org.keycloak.models.OrganizationModel; +import org.keycloak.models.OrganizationModel.IdentityProviderRedirectMode; import org.keycloak.representations.idm.GroupRepresentation; +import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.MemberRepresentation; import org.keycloak.representations.idm.OrganizationDomainRepresentation; import org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AbstractAdminTest; +import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.admin.Users; import org.keycloak.testsuite.broker.BrokerConfiguration; @@ -60,6 +51,19 @@ import org.keycloak.testsuite.pages.SelectOrganizationPage; import org.keycloak.testsuite.pages.UpdateAccountInformationPage; import org.keycloak.testsuite.util.TestCleanup; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; + +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/IdentityProviderThemeConfigTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/IdentityProviderThemeConfigTest.java index 14a87351d6d..76b084484b9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/IdentityProviderThemeConfigTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/IdentityProviderThemeConfigTest.java @@ -1,13 +1,14 @@ package org.keycloak.testsuite.organization.admin; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.util.IdentityProviderBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + public class IdentityProviderThemeConfigTest extends AbstractAdminTest { @Before diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationGroupTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationGroupTest.java index a5d4f80c7ee..05e2d7e2b52 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationGroupTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationGroupTest.java @@ -17,17 +17,10 @@ package org.keycloak.testsuite.organization.admin; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.junit.Test; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.models.GroupModel; import org.keycloak.models.ModelValidationException; @@ -42,6 +35,14 @@ import org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.runonserver.RunOnServer; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class OrganizationGroupTest extends AbstractOrganizationTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationInvitationLinkTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationInvitationLinkTest.java index d8d6a2a5751..ecc492c62f9 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationInvitationLinkTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationInvitationLinkTest.java @@ -17,13 +17,8 @@ package org.keycloak.testsuite.organization.admin; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; - import java.io.IOException; +import java.time.Duration; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -35,12 +30,7 @@ import java.util.function.Predicate; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import jakarta.ws.rs.core.Response; -import java.time.Duration; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.resource.OrganizationResource; import org.keycloak.common.util.UriUtils; import org.keycloak.cookie.CookieType; @@ -51,10 +41,10 @@ import org.keycloak.representations.idm.MemberRepresentation; import org.keycloak.representations.idm.MembershipType; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.AbstractAuthenticationTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.AbstractAuthenticationTest; import org.keycloak.testsuite.authentication.PushButtonAuthenticatorFactory; import org.keycloak.testsuite.pages.InfoPage; import org.keycloak.testsuite.pages.RegisterPage; @@ -63,10 +53,22 @@ import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.MailUtils; import org.keycloak.testsuite.util.MailUtils.EmailBody; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.UserBuilder; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.By; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; + public class OrganizationInvitationLinkTest extends AbstractOrganizationTest { @Rule diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationTest.java index bb694f56c6f..73cd596c611 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationTest.java @@ -17,6 +17,42 @@ package org.keycloak.testsuite.organization.admin; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; + +import org.keycloak.admin.client.resource.OrganizationResource; +import org.keycloak.admin.client.resource.OrganizationsResource; +import org.keycloak.admin.client.resource.RealmResource; +import org.keycloak.models.OrganizationModel; +import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.organization.OrganizationProvider; +import org.keycloak.representations.idm.ErrorRepresentation; +import org.keycloak.representations.idm.IdentityProviderRepresentation; +import org.keycloak.representations.idm.OrganizationDomainRepresentation; +import org.keycloak.representations.idm.OrganizationRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.runonserver.RunOnServer; +import org.keycloak.testsuite.updaters.RealmAttributeUpdater; +import org.keycloak.testsuite.util.RealmBuilder; + +import org.junit.Assert; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; @@ -35,42 +71,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Comparator; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.stream.Collectors; - -import jakarta.ws.rs.NotFoundException; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; - -import java.io.IOException; -import java.util.stream.IntStream; -import java.util.stream.Stream; - -import org.junit.Assert; -import org.junit.Test; -import org.keycloak.admin.client.resource.OrganizationResource; -import org.keycloak.admin.client.resource.OrganizationsResource; -import org.keycloak.admin.client.resource.RealmResource; -import org.keycloak.models.OrganizationModel; -import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.organization.OrganizationProvider; -import org.keycloak.representations.idm.ErrorRepresentation; -import org.keycloak.representations.idm.IdentityProviderRepresentation; -import org.keycloak.representations.idm.OrganizationDomainRepresentation; -import org.keycloak.representations.idm.OrganizationRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.admin.ApiUtil; -import org.keycloak.testsuite.runonserver.RunOnServer; -import org.keycloak.testsuite.updaters.RealmAttributeUpdater; -import org.keycloak.testsuite.util.RealmBuilder; - public class OrganizationTest extends AbstractOrganizationTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationThemeTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationThemeTest.java index 8aeb58610d4..9a6628e1042 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationThemeTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationThemeTest.java @@ -19,18 +19,11 @@ package org.keycloak.testsuite.organization.admin; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; - import java.util.List; import java.util.Map.Entry; import jakarta.ws.rs.core.Response; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.admin.client.resource.OrganizationResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.OrganizationModel.IdentityProviderRedirectMode; @@ -45,6 +38,16 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginUpdateProfilePage; import org.keycloak.testsuite.util.UserBuilder; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + +import static org.hamcrest.MatcherAssert.assertThat; + public class OrganizationThemeTest extends AbstractOrganizationTest { @Page diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authentication/OrganizationAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authentication/OrganizationAuthenticationTest.java index 21cd20e7892..5db6f13ca04 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authentication/OrganizationAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authentication/OrganizationAuthenticationTest.java @@ -17,20 +17,13 @@ package org.keycloak.testsuite.organization.authentication; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; - import java.io.IOException; import java.net.URLDecoder; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import jakarta.ws.rs.core.Response; -import org.hamcrest.Matcher; -import org.hamcrest.Matchers; -import org.junit.Test; + import org.keycloak.admin.client.resource.OrganizationResource; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel.RequiredAction; @@ -47,6 +40,16 @@ import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.UserBuilder; +import org.hamcrest.Matcher; +import org.hamcrest.Matchers; +import org.junit.Test; + +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertEquals; + public class OrganizationAuthenticationTest extends AbstractOrganizationTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authz/OrganizationAdminPermissionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authz/OrganizationAdminPermissionsTest.java index 8c1b8cbc58c..3e0c3cc1abe 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authz/OrganizationAdminPermissionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/authz/OrganizationAdminPermissionsTest.java @@ -17,15 +17,10 @@ package org.keycloak.testsuite.organization.authz; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.fail; - import jakarta.ws.rs.ForbiddenException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.hamcrest.Matchers; -import org.junit.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.AdminRoles; @@ -39,6 +34,13 @@ import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; import org.keycloak.testsuite.util.AdminClientUtil; import org.keycloak.testsuite.util.UserBuilder; +import org.hamcrest.Matchers; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.fail; + public class OrganizationAdminPermissionsTest extends AbstractOrganizationTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/AbstractBrokerSelfRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/AbstractBrokerSelfRegistrationTest.java index f63b9f46a05..36d7bc471fa 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/AbstractBrokerSelfRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/AbstractBrokerSelfRegistrationTest.java @@ -17,25 +17,13 @@ package org.keycloak.testsuite.organization.broker; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.models.OrganizationDomainModel.ANY_DOMAIN; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; - import java.util.List; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Test; + import org.keycloak.admin.client.resource.OrganizationIdentityProviderResource; import org.keycloak.admin.client.resource.OrganizationMemberResource; import org.keycloak.admin.client.resource.OrganizationResource; @@ -57,6 +45,21 @@ import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.UserBuilder; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Test; + +import static org.keycloak.models.OrganizationDomainModel.ANY_DOMAIN; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public abstract class AbstractBrokerSelfRegistrationTest extends AbstractOrganizationTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/BrokerConfigurationWrapper.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/BrokerConfigurationWrapper.java index d1c6ad0e630..10ca8bbcb48 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/BrokerConfigurationWrapper.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/BrokerConfigurationWrapper.java @@ -17,8 +17,6 @@ package org.keycloak.testsuite.organization.broker; -import static org.keycloak.testsuite.AbstractTestRealmKeycloakTest.TEST_REALM_NAME; - import java.util.List; import org.keycloak.models.IdentityProviderSyncMode; @@ -28,6 +26,8 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.broker.BrokerConfiguration; import org.keycloak.testsuite.util.UserBuilder; +import static org.keycloak.testsuite.AbstractTestRealmKeycloakTest.TEST_REALM_NAME; + public class BrokerConfigurationWrapper implements BrokerConfiguration { private final String orgName; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationIdentityProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationIdentityProviderTest.java index a418da050e7..b82630b089b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationIdentityProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationIdentityProviderTest.java @@ -17,22 +17,13 @@ package org.keycloak.testsuite.organization.broker; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertFalse; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertNotNull; -import static org.keycloak.models.OrganizationModel.ORGANIZATION_DOMAIN_ATTRIBUTE; - import java.util.List; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.admin.client.resource.IdentityProviderResource; import org.keycloak.admin.client.resource.OrganizationIdentityProviderResource; import org.keycloak.admin.client.resource.OrganizationResource; @@ -44,6 +35,18 @@ import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.models.OrganizationModel.ORGANIZATION_DOMAIN_ATTRIBUTE; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + public class OrganizationIdentityProviderTest extends AbstractOrganizationTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationOIDCBrokerSelfRegistrationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationOIDCBrokerSelfRegistrationTest.java index 45520566d64..d7d92524c61 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationOIDCBrokerSelfRegistrationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/broker/OrganizationOIDCBrokerSelfRegistrationTest.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.organization.broker; -import org.junit.Test; +import java.util.List; + import org.keycloak.admin.client.resource.OrganizationResource; import org.keycloak.representations.idm.IdentityProviderRepresentation; -import java.util.List; +import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/cache/OrganizationCacheTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/cache/OrganizationCacheTest.java index d0d7e3a47b0..9f903b60771 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/cache/OrganizationCacheTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/cache/OrganizationCacheTest.java @@ -17,20 +17,10 @@ package org.keycloak.testsuite.organization.cache; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.keycloak.models.cache.infinispan.idp.InfinispanIdentityProviderStorageProvider.cacheKeyForLogin; -import static org.keycloak.models.cache.infinispan.idp.InfinispanIdentityProviderStorageProvider.cacheKeyOrgId; -import static org.keycloak.models.cache.infinispan.organization.InfinispanOrganizationProvider.cacheKeyOrgMemberCount; - import java.util.List; import java.util.Set; import java.util.stream.Stream; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.keycloak.models.IdentityProviderStorageProvider; import org.keycloak.models.IdentityProviderStorageProvider.FetchMode; import org.keycloak.models.OrganizationDomainModel; @@ -38,8 +28,8 @@ import org.keycloak.models.OrganizationModel; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.models.cache.CacheRealmProvider; -import org.keycloak.models.cache.infinispan.RealmCacheSession; import org.keycloak.models.cache.infinispan.CachedCount; +import org.keycloak.models.cache.infinispan.RealmCacheSession; import org.keycloak.models.cache.infinispan.idp.IdentityProviderListQuery; import org.keycloak.organization.OrganizationProvider; import org.keycloak.representations.idm.IdentityProviderRepresentation; @@ -49,6 +39,18 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; import org.keycloak.testsuite.runonserver.RunOnServer; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.models.cache.infinispan.idp.InfinispanIdentityProviderStorageProvider.cacheKeyForLogin; +import static org.keycloak.models.cache.infinispan.idp.InfinispanIdentityProviderStorageProvider.cacheKeyOrgId; +import static org.keycloak.models.cache.infinispan.organization.InfinispanOrganizationProvider.cacheKeyOrgMemberCount; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + public class OrganizationCacheTest extends AbstractOrganizationTest { @Before diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/exportimport/OrganizationExportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/exportimport/OrganizationExportTest.java index 170cb4079b6..a452d7a233e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/exportimport/OrganizationExportTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/exportimport/OrganizationExportTest.java @@ -17,16 +17,6 @@ package org.keycloak.testsuite.organization.exportimport; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.util.ArrayList; import java.util.HashMap; @@ -36,8 +26,7 @@ import java.util.Objects; import java.util.Optional; import jakarta.ws.rs.core.Response; -import org.hamcrest.Matchers; -import org.junit.Test; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.OrganizationResource; import org.keycloak.admin.client.resource.RealmResource; @@ -60,6 +49,19 @@ import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.UserBuilder; +import org.hamcrest.Matchers; +import org.junit.Test; + +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class OrganizationExportTest extends AbstractOrganizationTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/federation/OrganizationFederationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/federation/OrganizationFederationTest.java index 67949e7ba60..4a6dfb53a38 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/federation/OrganizationFederationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/federation/OrganizationFederationTest.java @@ -17,10 +17,12 @@ package org.keycloak.testsuite.organization.federation; -import org.apache.commons.io.FileUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.List; +import java.util.stream.Stream; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.component.ComponentModel; import org.keycloak.models.OrganizationModel; @@ -34,11 +36,10 @@ import org.keycloak.testsuite.federation.ldap.AbstractLDAPTest; import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; import org.keycloak.testsuite.runonserver.RunOnServer; -import java.io.File; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.List; -import java.util.stream.Stream; +import org.apache.commons.io.FileUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationOIDCProtocolMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationOIDCProtocolMapperTest.java index 7449e7ee9a9..77d8d4c0f0f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationOIDCProtocolMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationOIDCProtocolMapperTest.java @@ -17,21 +17,6 @@ package org.keycloak.testsuite.organization.mapper; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasItem; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.oneOf; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; @@ -40,9 +25,7 @@ import java.util.Map; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.OAuth2Constants; import org.keycloak.TokenVerifier; import org.keycloak.admin.client.resource.ClientResource; @@ -73,6 +56,25 @@ import org.keycloak.testsuite.broker.KcOidcBrokerConfiguration; import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasItem; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.Matchers.oneOf; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class OrganizationOIDCProtocolMapperTest extends AbstractOrganizationTest { @Before diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationSAMLProtocolMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationSAMLProtocolMapperTest.java index 22b2b3aa7cb..30a4c9b0ed2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationSAMLProtocolMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/mapper/OrganizationSAMLProtocolMapperTest.java @@ -17,24 +17,19 @@ package org.keycloak.testsuite.organization.mapper; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.SamlStreams.assertionsUnencrypted; -import static org.keycloak.testsuite.util.SamlStreams.attributeStatements; - import java.util.List; import java.util.function.Function; import java.util.stream.Stream; import jakarta.ws.rs.core.UriBuilder; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.admin.client.resource.OrganizationResource; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType; import org.keycloak.dom.saml.v2.assertion.AttributeStatementType.ASTChoiceType; import org.keycloak.dom.saml.v2.assertion.AttributeType; +import org.keycloak.organization.protocol.mappers.saml.OrganizationMembershipMapper; import org.keycloak.protocol.saml.SamlConfigAttributes; import org.keycloak.protocol.saml.SamlProtocol; -import org.keycloak.organization.protocol.mappers.saml.OrganizationMembershipMapper; import org.keycloak.representations.idm.IdentityProviderRepresentation; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; @@ -46,6 +41,14 @@ import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.util.SamlStreams.assertionsUnencrypted; +import static org.keycloak.testsuite.util.SamlStreams.attributeStatements; + +import static org.hamcrest.MatcherAssert.assertThat; + public class OrganizationSAMLProtocolMapperTest extends AbstractOrganizationTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberTest.java index 1117ddab297..3539a0f74e8 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberTest.java @@ -17,37 +17,17 @@ package org.keycloak.testsuite.organization.member; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.empty; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.models.OrganizationDomainModel.ANY_DOMAIN; -import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; - +import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.stream.Stream; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import java.io.IOException; -import java.util.stream.Stream; -import org.hamcrest.Matchers; -import org.junit.Test; import org.keycloak.admin.client.resource.OrganizationMemberResource; import org.keycloak.admin.client.resource.OrganizationResource; import org.keycloak.admin.client.resource.UserResource; @@ -71,6 +51,28 @@ import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.UserBuilder; +import org.hamcrest.Matchers; +import org.junit.Test; + +import static org.keycloak.models.OrganizationDomainModel.ANY_DOMAIN; +import static org.keycloak.testsuite.broker.BrokerTestTools.waitForPage; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.empty; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class OrganizationMemberTest extends AbstractOrganizationTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberWithLdapTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberWithLdapTest.java index cc0a45930b4..0172466d1dd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberWithLdapTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/member/OrganizationMemberWithLdapTest.java @@ -22,8 +22,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicReference; import jakarta.ws.rs.core.Response; -import org.junit.ClassRule; -import org.junit.Test; + import org.keycloak.admin.client.resource.OrganizationResource; import org.keycloak.component.ComponentModel; import org.keycloak.models.GroupModel; @@ -40,6 +39,9 @@ import org.keycloak.testsuite.organization.admin.AbstractOrganizationTest; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.testsuite.util.LDAPTestUtils; +import org.junit.ClassRule; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordAgePolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordAgePolicyTest.java index 0e7f7e47fdf..d5f5dbcb18d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordAgePolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordAgePolicyTest.java @@ -17,13 +17,13 @@ package org.keycloak.testsuite.policy; +import java.io.IOException; +import java.util.List; +import java.util.function.Consumer; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; @@ -40,9 +40,11 @@ import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; -import java.io.IOException; -import java.util.List; -import java.util.function.Consumer; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD; import static org.keycloak.testsuite.admin.ApiUtil.getCreatedId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordHistoryPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordHistoryPolicyTest.java index c643137ddd9..3a084c1977a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordHistoryPolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordHistoryPolicyTest.java @@ -17,18 +17,21 @@ package org.keycloak.testsuite.policy; import java.util.function.Consumer; + import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AbstractAuthTest; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + import static org.keycloak.representations.idm.CredentialRepresentation.PASSWORD; import static org.keycloak.testsuite.admin.ApiUtil.getCreatedId; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordPolicyTest.java index 9ffbb5558a3..8e56ed697ad 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordPolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/policy/PasswordPolicyTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.policy; -import org.junit.Assert; -import org.junit.Test; +import java.io.File; +import java.util.List; + import org.keycloak.models.ModelException; import org.keycloak.models.PasswordPolicy; import org.keycloak.models.RealmModel; @@ -32,8 +33,8 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.util.RealmBuilder; -import java.io.File; -import java.util.List; +import org.junit.Assert; +import org.junit.Test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/providers/ProvidersOverrideTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/providers/ProvidersOverrideTest.java index 12ecedc7100..c0eaaa81e0d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/providers/ProvidersOverrideTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/providers/ProvidersOverrideTest.java @@ -19,7 +19,8 @@ package org.keycloak.testsuite.providers; -import org.junit.Test; +import java.util.List; + import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.authenticators.directgrant.ValidateOTP; import org.keycloak.authentication.authenticators.directgrant.ValidatePassword; @@ -35,7 +36,7 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; -import java.util.List; +import org.junit.Test; /** * Test for having multiple providerFactory of smae SPI with same providerId diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/runonserver/RunOnServerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/runonserver/RunOnServerTest.java index 33603579731..f7de110cc2a 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/runonserver/RunOnServerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/runonserver/RunOnServerTest.java @@ -17,14 +17,16 @@ package org.keycloak.testsuite.runonserver; -import org.junit.ComparisonFailure; -import org.junit.Test; +import java.util.List; + import org.keycloak.models.ModelException; import org.keycloak.models.RealmModel; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import java.util.List; + +import org.junit.ComparisonFailure; +import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AbstractSamlTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AbstractSamlTest.java index 2765b377eee..eb2dcdde4be 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AbstractSamlTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AbstractSamlTest.java @@ -1,26 +1,5 @@ package org.keycloak.testsuite.saml; -import org.keycloak.common.crypto.CryptoIntegration; -import org.keycloak.common.util.CertificateUtils; -import org.keycloak.common.util.KeyUtils; -import org.keycloak.common.util.PemUtils; -import org.keycloak.dom.saml.v2.SAML2Object; -import org.keycloak.dom.saml.v2.assertion.AssertionType; -import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; -import org.keycloak.dom.saml.v2.assertion.NameIDType; -import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; -import org.keycloak.dom.saml.v2.protocol.ResponseType; -import org.keycloak.protocol.saml.SamlProtocol; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.services.resources.RealmsResource; -import org.keycloak.testsuite.AbstractAuthTest; -import org.keycloak.testsuite.util.SamlClient; - -import jakarta.ws.rs.core.UriBuilder; -import jakarta.ws.rs.core.UriBuilderException; -import org.keycloak.saml.common.constants.JBossSAMLURIConstants; -import org.keycloak.testsuite.util.saml.SamlConstants; - import java.net.URI; import java.security.KeyFactory; import java.security.KeyPair; @@ -33,14 +12,36 @@ import java.util.Base64; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.MatcherAssert.assertThat; +import jakarta.ws.rs.core.UriBuilder; +import jakarta.ws.rs.core.UriBuilderException; + +import org.keycloak.common.crypto.CryptoIntegration; +import org.keycloak.common.util.CertificateUtils; +import org.keycloak.common.util.KeyUtils; +import org.keycloak.common.util.PemUtils; +import org.keycloak.dom.saml.v2.SAML2Object; +import org.keycloak.dom.saml.v2.assertion.AssertionType; +import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; +import org.keycloak.dom.saml.v2.assertion.NameIDType; +import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; +import org.keycloak.dom.saml.v2.protocol.ResponseType; +import org.keycloak.protocol.saml.SamlProtocol; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.saml.common.constants.JBossSAMLURIConstants; +import org.keycloak.services.resources.RealmsResource; +import org.keycloak.testsuite.AbstractAuthTest; +import org.keycloak.testsuite.util.SamlClient; +import org.keycloak.testsuite.util.saml.SamlConstants; + import static org.keycloak.testsuite.util.Matchers.isSamlResponse; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SCHEME; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; import static org.keycloak.testsuite.utils.io.IOUtil.loadRealm; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; + /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingCustomResolverTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingCustomResolverTest.java index 5fa018e2c74..cbc3e14fdc7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingCustomResolverTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingCustomResolverTest.java @@ -1,7 +1,9 @@ package org.keycloak.testsuite.saml; -import org.junit.Ignore; -import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.util.Base64; +import java.util.concurrent.atomic.AtomicReference; + import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.testsuite.arquillian.annotation.SetDefaultProvider; import org.keycloak.testsuite.authentication.CustomTestingSamlArtifactResolver; @@ -9,16 +11,16 @@ import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.io.ByteArrayInputStream; -import java.util.Base64; -import java.util.concurrent.atomic.AtomicReference; +import org.junit.Ignore; +import org.junit.Test; +import static org.keycloak.testsuite.util.SamlClient.Binding.POST; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -import static org.keycloak.testsuite.util.SamlClient.Binding.POST; -import static org.hamcrest.MatcherAssert.assertThat; @SetDefaultProvider(spi = "saml-artifact-resolver", providerId = "0005") public class ArtifactBindingCustomResolverTest extends ArtifactBindingTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java index 1d9f67c4d78..e2e87f4f72a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingTest.java @@ -1,10 +1,21 @@ package org.keycloak.testsuite.saml; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.util.EntityUtils; -import org.hamcrest.Matchers; -import org.junit.Rule; -import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.Base64; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.xml.transform.dom.DOMSource; + +import jakarta.ws.rs.core.Response; + import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.metadata.SPSSODescriptorType; @@ -40,22 +51,23 @@ import org.keycloak.testsuite.util.saml.HandleArtifactStepBuilder; import org.keycloak.testsuite.util.saml.SamlMessageReceiver; import org.keycloak.testsuite.util.saml.SessionStateChecker; import org.keycloak.testsuite.utils.io.IOUtil; + +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.util.EntityUtils; +import org.hamcrest.Matchers; +import org.junit.Rule; +import org.junit.Test; import org.w3c.dom.Document; -import jakarta.ws.rs.core.Response; -import javax.xml.transform.dom.DOMSource; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.Base64; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import static org.keycloak.testsuite.util.Matchers.bodyHC; +import static org.keycloak.testsuite.util.Matchers.isSamlLogoutRequest; +import static org.keycloak.testsuite.util.Matchers.isSamlResponse; +import static org.keycloak.testsuite.util.Matchers.isSamlStatusResponse; +import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; +import static org.keycloak.testsuite.util.SamlClient.Binding.ARTIFACT_RESPONSE; +import static org.keycloak.testsuite.util.SamlClient.Binding.POST; +import static org.keycloak.testsuite.util.SamlClient.Binding.REDIRECT; +import static org.keycloak.testsuite.util.SamlUtils.getSPInstallationDescriptor; import static org.awaitility.Awaitility.await; import static org.hamcrest.MatcherAssert.assertThat; @@ -67,15 +79,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.keycloak.testsuite.util.Matchers.bodyHC; -import static org.keycloak.testsuite.util.Matchers.isSamlLogoutRequest; -import static org.keycloak.testsuite.util.Matchers.isSamlResponse; -import static org.keycloak.testsuite.util.Matchers.isSamlStatusResponse; -import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; -import static org.keycloak.testsuite.util.SamlClient.Binding.ARTIFACT_RESPONSE; -import static org.keycloak.testsuite.util.SamlClient.Binding.POST; -import static org.keycloak.testsuite.util.SamlClient.Binding.REDIRECT; -import static org.keycloak.testsuite.util.SamlUtils.getSPInstallationDescriptor; public class ArtifactBindingTest extends AbstractSamlTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingWithResolutionServiceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingWithResolutionServiceTest.java index 59f0089c51f..85c37539b8e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingWithResolutionServiceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ArtifactBindingWithResolutionServiceTest.java @@ -1,7 +1,5 @@ package org.keycloak.testsuite.saml; -import org.apache.http.util.EntityUtils; -import org.junit.Test; import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; @@ -20,20 +18,24 @@ import org.keycloak.testsuite.util.ArtifactResolutionService; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.util.saml.CreateArtifactMessageStepBuilder; + +import org.apache.http.util.EntityUtils; +import org.junit.Test; import org.w3c.dom.Document; +import static org.keycloak.testsuite.util.Matchers.bodyHC; +import static org.keycloak.testsuite.util.Matchers.isSamlStatusResponse; +import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; +import static org.keycloak.testsuite.util.SamlClient.Binding.POST; +import static org.keycloak.testsuite.util.SamlClient.Binding.REDIRECT; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.Matchers.bodyHC; -import static org.keycloak.testsuite.util.Matchers.isSamlStatusResponse; -import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; -import static org.keycloak.testsuite.util.SamlClient.Binding.POST; -import static org.keycloak.testsuite.util.SamlClient.Binding.REDIRECT; public class ArtifactBindingWithResolutionServiceTest extends AbstractSamlTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AudienceProtocolMappersTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AudienceProtocolMappersTest.java index efd810bee09..68797cffedb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AudienceProtocolMappersTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AudienceProtocolMappersTest.java @@ -20,13 +20,9 @@ import java.io.IOException; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; + import jakarta.ws.rs.core.Response; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.greaterThan; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.dom.saml.v2.assertion.AudienceRestrictionType; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.protocol.saml.mappers.SAMLAudienceProtocolMapper; @@ -36,12 +32,6 @@ import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.testsuite.admin.ApiUtil; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SCHEME; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; -import static org.keycloak.testsuite.saml.RoleMapperTest.createSamlProtocolMapper; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.ProtocolMappersUpdater; import org.keycloak.testsuite.updaters.RoleScopeUpdater; @@ -50,6 +40,20 @@ import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.testsuite.saml.RoleMapperTest.createSamlProtocolMapper; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SCHEME; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.greaterThan; + /** * * @author rmartinc diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AuthnRequestNameIdFormatTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AuthnRequestNameIdFormatTest.java index 9ce7d714882..2b0e46ff5a8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AuthnRequestNameIdFormatTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AuthnRequestNameIdFormatTest.java @@ -16,6 +16,8 @@ */ package org.keycloak.testsuite.saml; +import java.util.List; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.dom.saml.v2.assertion.NameIDType; @@ -26,10 +28,13 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.util.List; + import org.hamcrest.Matcher; import org.junit.Test; +import static org.keycloak.testsuite.util.SamlClient.Binding; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.instanceOf; @@ -37,8 +42,6 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; -import static org.keycloak.testsuite.util.SamlClient.Binding; -import static org.hamcrest.MatcherAssert.assertThat; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AuthnRequestTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AuthnRequestTest.java index 432f2129fab..19f7273ae97 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AuthnRequestTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/AuthnRequestTest.java @@ -17,12 +17,14 @@ package org.keycloak.testsuite.saml; import org.keycloak.testsuite.util.SamlClientBuilder; + import org.apache.http.util.EntityUtils; import org.junit.Test; -import static org.hamcrest.Matchers.containsString; import static org.keycloak.testsuite.util.SamlClient.Binding; + import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java index 7a5caeda556..3a4ccbceffe 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BasicSamlTest.java @@ -1,6 +1,19 @@ package org.keycloak.testsuite.saml; -import org.junit.Test; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.security.Signature; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.logging.Level; +import java.util.logging.Logger; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.adapters.saml.SamlDeployment; import org.keycloak.common.util.PemUtils; import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; @@ -31,18 +44,7 @@ import org.keycloak.testsuite.util.SamlClient.Step; import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.util.SamlUtils; import org.keycloak.utils.StringUtil; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.security.Signature; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.logging.Level; -import java.util.logging.Logger; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.Response.Status; -import jakarta.ws.rs.core.UriBuilder; + import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.CloseableHttpClient; @@ -53,26 +55,28 @@ import org.apache.xml.security.encryption.XMLCipher; import org.apache.xml.security.utils.EncryptionConstants; import org.hamcrest.Matcher; import org.jboss.resteasy.util.Encode; +import org.junit.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.Matchers.endsWith; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.matchesRegex; -import static org.junit.Assert.assertTrue; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.NAMEID_FORMAT_TRANSIENT; import static org.keycloak.saml.common.constants.JBossSAMLURIConstants.PROTOCOL_NSURI; +import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; import static org.keycloak.testsuite.utils.io.IOUtil.documentToString; import static org.keycloak.testsuite.utils.io.IOUtil.setDocElementAttributeValue; -import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; + +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.endsWith; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.matchesRegex; +import static org.hamcrest.Matchers.notNullValue; +import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertTrue; /** * @author mhajas diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BrokerTest.java index df81555de43..b0d05e6944a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/BrokerTest.java @@ -16,7 +16,19 @@ */ package org.keycloak.testsuite.saml; +import java.io.IOException; +import java.net.URI; +import java.security.KeyPair; +import java.util.List; import java.util.Map; +import java.util.Objects; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicReference; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; + +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; @@ -52,37 +64,28 @@ import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; import org.keycloak.testsuite.updaters.IdentityProviderCreator; import org.keycloak.testsuite.util.IdentityProviderBuilder; import org.keycloak.testsuite.util.SamlClientBuilder; +import org.keycloak.testsuite.util.saml.SamlBackchannelArtifactResolveReceiver; -import java.io.IOException; -import java.net.URI; -import java.security.KeyPair; -import java.util.List; -import java.util.Objects; -import java.util.UUID; -import java.util.concurrent.atomic.AtomicReference; -import jakarta.ws.rs.core.Response.Status; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; import org.apache.http.Header; import org.apache.http.HttpHeaders; import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Test; -import org.keycloak.testsuite.util.saml.SamlBackchannelArtifactResolveReceiver; import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.fail; import static org.keycloak.saml.SignatureAlgorithm.RSA_SHA1; import static org.keycloak.testsuite.util.Matchers.isSamlStatusResponse; import static org.keycloak.testsuite.util.SamlClient.Binding.POST; import static org.keycloak.testsuite.util.SamlClient.Binding.REDIRECT; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.fail; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ConcurrentAuthnRequestTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ConcurrentAuthnRequestTest.java index 1027519d1a3..443456f7da1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ConcurrentAuthnRequestTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ConcurrentAuthnRequestTest.java @@ -16,6 +16,16 @@ */ package org.keycloak.testsuite.saml; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.representations.idm.RealmRepresentation; @@ -29,16 +39,6 @@ import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.saml.LoginBuilder; import org.keycloak.testsuite.utils.io.IOUtil; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.protocol.HttpClientContext; @@ -49,11 +49,12 @@ import org.junit.Ignore; import org.junit.Test; import org.w3c.dom.Document; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.keycloak.testsuite.util.SamlClient.createLoginRequestDocument; import static org.keycloak.testsuite.util.SamlClient.Binding; import static org.keycloak.testsuite.util.SamlClient.RedirectStrategyWithSwitchableFollowRedirect; +import static org.keycloak.testsuite.util.SamlClient.createLoginRequestDocument; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IdpInitiatedLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IdpInitiatedLoginTest.java index 23e24b472b6..f5dabe26ab3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IdpInitiatedLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IdpInitiatedLoginTest.java @@ -18,9 +18,16 @@ package org.keycloak.testsuite.saml; import java.io.Closeable; import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; import org.keycloak.admin.client.resource.ClientsResource; import org.keycloak.admin.client.resource.UsersResource; +import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.saml.SamlProtocol; @@ -28,32 +35,27 @@ import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.idm.UserSessionRepresentation; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; +import org.keycloak.testsuite.updaters.ClientAttributeUpdater; +import org.keycloak.testsuite.updaters.IdentityProviderCreator; import org.keycloak.testsuite.util.ClientBuilder; +import org.keycloak.testsuite.util.IdentityProviderBuilder; import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; + import org.junit.Test; -import jakarta.ws.rs.core.Response; -import static org.hamcrest.Matchers.allOf; - -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.MatcherAssert.assertThat; -import org.keycloak.broker.saml.SAMLIdentityProviderConfig; -import org.keycloak.testsuite.updaters.ClientAttributeUpdater; -import org.keycloak.testsuite.updaters.IdentityProviderCreator; -import org.keycloak.testsuite.util.IdentityProviderBuilder; -import static org.hamcrest.Matchers.anyOf; import static org.keycloak.testsuite.util.Matchers.bodyHC; import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.anyOf; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IncludeOneTimeUseConditionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IncludeOneTimeUseConditionTest.java index 2628f3719cb..77782ea9da6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IncludeOneTimeUseConditionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/IncludeOneTimeUseConditionTest.java @@ -16,8 +16,11 @@ */ package org.keycloak.testsuite.saml; -import com.google.common.collect.Collections2; -import org.junit.Test; +import java.io.Closeable; +import java.io.IOException; +import java.util.Collection; +import java.util.List; + import org.keycloak.dom.saml.v2.assertion.ConditionAbstractType; import org.keycloak.dom.saml.v2.assertion.ConditionsType; import org.keycloak.dom.saml.v2.assertion.OneTimeUseType; @@ -27,18 +30,16 @@ import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.io.Closeable; -import java.io.IOException; -import java.util.Collection; -import java.util.List; +import com.google.common.collect.Collections2; +import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; /** * KEYCLOAK-4360 diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/LogoutTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/LogoutTest.java index 7bcb943d2db..fc1d9c039ab 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/LogoutTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/LogoutTest.java @@ -16,6 +16,18 @@ */ package org.keycloak.testsuite.saml; +import java.io.Closeable; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.function.Consumer; +import javax.xml.transform.dom.DOMSource; + +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriBuilderException; +import jakarta.xml.ws.soap.SOAPFaultException; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.broker.saml.SAMLIdentityProviderConfig; import org.keycloak.broker.saml.SAMLIdentityProviderFactory; @@ -46,32 +58,14 @@ import org.keycloak.testsuite.util.IdentityProviderBuilder; import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; - import org.keycloak.testsuite.util.saml.CreateLogoutRequestStepBuilder; -import java.io.Closeable; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; -import java.util.function.Consumer; -import jakarta.ws.rs.core.Response.Status; -import jakarta.ws.rs.core.UriBuilderException; -import javax.xml.transform.dom.DOMSource; -import jakarta.xml.ws.soap.SOAPFaultException; +import org.keycloak.testsuite.util.saml.SamlBackchannelLogoutReceiver; import org.apache.http.HttpResponse; import org.apache.http.client.methods.CloseableHttpResponse; import org.junit.Before; import org.junit.Test; -import org.keycloak.testsuite.util.saml.SamlBackchannelLogoutReceiver; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import static org.keycloak.testsuite.util.Matchers.isSamlLogoutRequest; import static org.keycloak.testsuite.util.Matchers.isSamlResponse; import static org.keycloak.testsuite.util.Matchers.isSamlStatusResponse; @@ -79,6 +73,14 @@ import static org.keycloak.testsuite.util.SamlClient.Binding.POST; import static org.keycloak.testsuite.util.SamlClient.Binding.REDIRECT; import static org.keycloak.testsuite.util.SamlClient.Binding.SOAP; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * * @author hmlnarik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/NameIdMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/NameIdMapperTest.java index 204457a21a4..ca08b1b0631 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/NameIdMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/NameIdMapperTest.java @@ -1,8 +1,7 @@ package org.keycloak.testsuite.saml; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import java.io.IOException; + import org.keycloak.dom.saml.v2.assertion.NameIDType; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.protocol.ProtocolMapperUtils; @@ -13,16 +12,19 @@ import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.ProtocolMappersUpdater; -import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.testsuite.util.SamlClient.Binding; +import org.keycloak.testsuite.util.SamlClientBuilder; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.saml.RoleMapperTest.createSamlProtocolMapper; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SCHEME; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; -import java.io.IOException; +import static org.junit.Assert.assertEquals; public class NameIdMapperTest extends AbstractSamlTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ProtocolMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ProtocolMapperTest.java index dc32b26c58b..29842aa6b29 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ProtocolMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/ProtocolMapperTest.java @@ -1,7 +1,10 @@ package org.keycloak.testsuite.saml; -import org.junit.Before; -import org.junit.Test; +import java.util.Collections; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.protocol.saml.mappers.AttributeStatementHelper; @@ -14,19 +17,18 @@ import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.util.Collections; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.junit.Before; +import org.junit.Test; -import static org.hamcrest.CoreMatchers.nullValue; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.saml.RoleMapperTest.createSamlProtocolMapper; import static org.keycloak.testsuite.util.SamlStreams.assertionsUnencrypted; import static org.keycloak.testsuite.util.SamlStreams.attributeStatements; import static org.keycloak.testsuite.util.SamlStreams.attributesUnecrypted; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.hasSize; + /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/RoleMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/RoleMapperTest.java index 33bf9780fed..44efc514299 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/RoleMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/RoleMapperTest.java @@ -16,6 +16,14 @@ */ package org.keycloak.testsuite.saml; +import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.protocol.saml.SamlProtocol; @@ -34,25 +42,19 @@ import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.io.IOException; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; import org.junit.After; import org.junit.Before; import org.junit.Test; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.keycloak.testsuite.util.SamlStreams.assertionsUnencrypted; +import static org.keycloak.testsuite.util.SamlStreams.attributeStatements; +import static org.keycloak.testsuite.util.SamlStreams.attributesUnecrypted; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SCHEME; import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; -import static org.keycloak.testsuite.util.SamlStreams.assertionsUnencrypted; -import static org.keycloak.testsuite.util.SamlStreams.attributesUnecrypted; -import static org.keycloak.testsuite.util.SamlStreams.attributeStatements; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java index 38f241be286..e740a4b4487 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SOAPBindingTest.java @@ -16,7 +16,10 @@ */ package org.keycloak.testsuite.saml; -import org.junit.Test; +import jakarta.ws.rs.core.Response; +import jakarta.xml.soap.MessageFactory; +import jakarta.xml.soap.SOAPMessage; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; import org.keycloak.dom.saml.v2.protocol.ResponseType; @@ -29,9 +32,12 @@ import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.SamlClientBuilder; -import jakarta.ws.rs.core.Response; -import jakarta.xml.soap.MessageFactory; -import jakarta.xml.soap.SOAPMessage; +import org.junit.Test; + +import static org.keycloak.testsuite.util.Matchers.isSamlResponse; +import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; +import static org.keycloak.testsuite.util.SamlClient.Binding.POST; +import static org.keycloak.testsuite.util.SamlClient.Binding.SOAP; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; @@ -40,10 +46,6 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.nullValue; -import static org.keycloak.testsuite.util.Matchers.isSamlResponse; -import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; -import static org.keycloak.testsuite.util.SamlClient.Binding.POST; -import static org.keycloak.testsuite.util.SamlClient.Binding.SOAP; public class SOAPBindingTest extends AbstractSamlTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientCertificateExpirationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientCertificateExpirationTest.java index 9aade283f6e..751dd1abb74 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientCertificateExpirationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientCertificateExpirationTest.java @@ -16,14 +16,17 @@ */ package org.keycloak.testsuite.saml; +import jakarta.ws.rs.core.Response.Status; + import org.keycloak.protocol.saml.SamlConfigAttributes; import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; -import jakarta.ws.rs.core.Response.Status; + import org.junit.Test; + import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_NAME; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientTest.java index 5cabafb1858..10ba18f953a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlClientTest.java @@ -1,14 +1,9 @@ package org.keycloak.testsuite.saml; -import org.apache.commons.io.IOUtils; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpUriRequest; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Test; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.StandardCharsets; + import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.saml.SamlProtocol; @@ -19,11 +14,17 @@ import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.testsuite.util.ClientBuilder; import org.keycloak.testsuite.util.SamlClient; -import org.w3c.dom.Document; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; +import org.apache.commons.io.IOUtils; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpUriRequest; +import org.apache.http.client.protocol.HttpClientContext; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Test; +import org.w3c.dom.Document; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlConsentTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlConsentTest.java index e7f9546cbb5..19a93d46226 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlConsentTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlConsentTest.java @@ -1,8 +1,9 @@ package org.keycloak.testsuite.saml; +import java.util.List; + import org.keycloak.protocol.saml.SamlConfigAttributes; import org.keycloak.protocol.saml.SamlProtocol; -import org.junit.Test; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.saml.common.exceptions.ConfigurationException; @@ -10,11 +11,11 @@ import org.keycloak.saml.common.exceptions.ParsingException; import org.keycloak.saml.common.exceptions.ProcessingException; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; import org.keycloak.testsuite.util.ClientBuilder; -import org.keycloak.testsuite.utils.io.IOUtil; - import org.keycloak.testsuite.util.SamlClient.Binding; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.util.List; +import org.keycloak.testsuite.utils.io.IOUtil; + +import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlRedirectBindingTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlRedirectBindingTest.java index 687799c3a63..c78462e4b19 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlRedirectBindingTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlRedirectBindingTest.java @@ -17,25 +17,29 @@ package org.keycloak.testsuite.saml; import java.io.IOException; + import org.keycloak.dom.saml.v2.protocol.AuthnRequestType; -import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; -import org.keycloak.testsuite.util.SamlClient; -import org.keycloak.testsuite.util.SamlClient.Binding; -import org.apache.http.client.methods.HttpUriRequest; -import org.junit.Test; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.MatcherAssert.assertThat; import org.keycloak.dom.saml.v2.protocol.ResponseType; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; +import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; import org.keycloak.saml.processing.core.saml.v2.common.SAMLDocumentHolder; +import org.keycloak.testsuite.util.SamlClient; +import org.keycloak.testsuite.util.SamlClient.Binding; +import org.keycloak.testsuite.util.SamlClientBuilder; + +import org.apache.http.client.methods.HttpUriRequest; +import org.junit.Test; + import static org.keycloak.testsuite.saml.AbstractSamlTest.REALM_NAME; import static org.keycloak.testsuite.saml.AbstractSamlTest.SAML_ASSERTION_CONSUMER_URL_SALES_POST; import static org.keycloak.testsuite.saml.AbstractSamlTest.SAML_CLIENT_ID_SALES_POST; import static org.keycloak.testsuite.util.Matchers.isSamlStatusResponse; -import org.keycloak.testsuite.util.SamlClientBuilder; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlRelayStateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlRelayStateTest.java index f5e455a3849..17b1a348619 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlRelayStateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlRelayStateTest.java @@ -1,16 +1,17 @@ package org.keycloak.testsuite.saml; -import org.junit.Ignore; -import org.junit.Test; +import java.io.Closeable; +import java.util.List; +import java.util.UUID; + import org.keycloak.protocol.saml.SamlProtocol; import org.keycloak.testsuite.AbstractConcurrencyTest; import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.io.Closeable; -import java.util.List; -import java.util.UUID; +import org.junit.Ignore; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java index 28571e770ae..65e40a16c4b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SamlReverseProxyTest.java @@ -16,6 +16,21 @@ */ package org.keycloak.testsuite.saml; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; + +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilder; + +import org.keycloak.protocol.saml.SamlProtocol; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.saml.SAML2LogoutRequestBuilder; +import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; +import org.keycloak.services.resources.RealmsResource; +import org.keycloak.testsuite.util.ReverseProxy; +import org.keycloak.testsuite.util.SamlClient; + import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.impl.client.CloseableHttpClient; @@ -24,25 +39,13 @@ import org.apache.http.util.EntityUtils; import org.hamcrest.Matcher; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.protocol.saml.SamlProtocol; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.saml.SAML2LogoutRequestBuilder; -import org.keycloak.saml.processing.api.saml.v2.request.SAML2Request; -import org.keycloak.services.resources.RealmsResource; -import org.keycloak.testsuite.util.ReverseProxy; -import org.keycloak.testsuite.util.SamlClient; import org.w3c.dom.Document; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.UriBuilder; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; - -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.util.Matchers.statusCodeIsHC; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + /** * SAML tests using a {@code frontendUrl} that points to a reverse proxy. The SAML request destination should be validated * against the proxy address and any redirection should also have the proxy as target. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SessionNotOnOrAfterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SessionNotOnOrAfterTest.java index 4c8da162677..4c8b410cdf5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SessionNotOnOrAfterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/saml/SessionNotOnOrAfterTest.java @@ -1,30 +1,31 @@ package org.keycloak.testsuite.saml; import java.util.List; -import org.junit.Test; +import java.util.Set; + import org.keycloak.dom.saml.v2.SAML2Object; import org.keycloak.dom.saml.v2.assertion.AuthnStatementType; +import org.keycloak.dom.saml.v2.assertion.ConditionsType; import org.keycloak.dom.saml.v2.assertion.StatementAbstractType; +import org.keycloak.dom.saml.v2.assertion.SubjectConfirmationDataType; +import org.keycloak.dom.saml.v2.assertion.SubjectConfirmationType; import org.keycloak.dom.saml.v2.protocol.ResponseType; +import org.keycloak.protocol.saml.SamlConfigAttributes; import org.keycloak.saml.common.constants.JBossSAMLURIConstants; import org.keycloak.saml.processing.core.saml.v2.util.XMLTimeUtil; +import org.keycloak.testsuite.updaters.ClientAttributeUpdater; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.Matchers; import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; -import java.util.Set; +import org.junit.Assert; +import org.junit.Test; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; -import org.junit.Assert; -import static org.hamcrest.MatcherAssert.assertThat; -import org.keycloak.dom.saml.v2.assertion.ConditionsType; -import org.keycloak.dom.saml.v2.assertion.SubjectConfirmationDataType; -import org.keycloak.dom.saml.v2.assertion.SubjectConfirmationType; -import org.keycloak.protocol.saml.SamlConfigAttributes; -import org.keycloak.testsuite.updaters.ClientAttributeUpdater; /** * @author mhajas diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedSAMLScriptMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedSAMLScriptMapperTest.java index db1ff8053d3..ac1a9c242e3 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedSAMLScriptMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedSAMLScriptMapperTest.java @@ -6,15 +6,6 @@ import java.util.stream.Stream; import jakarta.ws.rs.core.Response; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.TargetsContainer; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; import org.keycloak.dom.saml.v2.assertion.AssertionType; import org.keycloak.dom.saml.v2.assertion.AttributeType; import org.keycloak.protocol.saml.SamlProtocol; @@ -37,8 +28,16 @@ import org.keycloak.testsuite.util.SamlClient; import org.keycloak.testsuite.util.SamlClientBuilder; import org.keycloak.util.JsonSerialization; -import static org.junit.Assert.assertFalse; -import static org.hamcrest.MatcherAssert.assertThat; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + import static org.keycloak.common.Profile.Feature.SCRIPTS; import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; import static org.keycloak.testsuite.saml.RoleMapperTest.createSamlProtocolMapper; @@ -46,6 +45,9 @@ import static org.keycloak.testsuite.util.SamlStreams.assertionsUnencrypted; import static org.keycloak.testsuite.util.SamlStreams.attributeStatements; import static org.keycloak.testsuite.util.SamlStreams.attributesUnecrypted; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertFalse; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptAuthenticatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptAuthenticatorTest.java index 6ea9a783299..21204a2c56b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptAuthenticatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptAuthenticatorTest.java @@ -16,10 +16,6 @@ */ package org.keycloak.testsuite.script; -import static org.junit.Assert.assertFalse; -import static org.keycloak.common.Profile.Feature.SCRIPTS; -import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; - import java.io.IOException; import java.util.HashMap; import java.util.List; @@ -29,16 +25,6 @@ import java.util.stream.Collectors; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.core.Response; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.TargetsContainer; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.authentication.authenticators.browser.ScriptBasedAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; @@ -53,8 +39,8 @@ import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.provider.ScriptProviderDescriptor; -import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.AbstractAuthenticationTest; +import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.arquillian.annotation.EnableFeature; import org.keycloak.testsuite.forms.AbstractFlowTest; @@ -66,6 +52,22 @@ import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.common.Profile.Feature.SCRIPTS; +import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; + +import static org.junit.Assert.assertFalse; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptMapperTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptMapperTest.java index 0c872763b2f..37d49d196e7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptMapperTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptMapperTest.java @@ -16,22 +16,8 @@ */ package org.keycloak.testsuite.script; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.keycloak.common.Profile.Feature.SCRIPTS; -import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; -import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createScriptMapper; - import java.io.IOException; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.TargetsContainer; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.BeforeClass; -import org.junit.Test; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.protocol.oidc.mappers.ScriptBasedOIDCProtocolMapper; @@ -47,6 +33,22 @@ import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.AuthorizationEndpointResponse; import org.keycloak.util.JsonSerialization; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.BeforeClass; +import org.junit.Test; + +import static org.keycloak.common.Profile.Feature.SCRIPTS; +import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; +import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createScriptMapper; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptPolicyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptPolicyTest.java index 84916e9c6b8..0938ba9753d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptPolicyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/DeployedScriptPolicyTest.java @@ -16,22 +16,11 @@ */ package org.keycloak.testsuite.script; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; - -import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.List; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.TargetsContainer; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.AuthorizationResource; import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.ClientsResource; @@ -57,6 +46,20 @@ import org.keycloak.testsuite.util.RolesBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.util.JsonSerialization; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.TargetsContainer; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/UndeployedScriptMapperNotAvailableTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/UndeployedScriptMapperNotAvailableTest.java index df03132bbc0..459cd4d14ed 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/UndeployedScriptMapperNotAvailableTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/script/UndeployedScriptMapperNotAvailableTest.java @@ -16,14 +16,17 @@ */ package org.keycloak.testsuite.script; -import static org.junit.Assert.assertTrue; -import static org.keycloak.common.Profile.Feature.SCRIPTS; -import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; -import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; -import static org.keycloak.testsuite.util.ProtocolMapperUtil.createScriptMapper; - import java.io.IOException; +import org.keycloak.admin.client.resource.ClientResource; +import org.keycloak.representations.idm.ProtocolMapperRepresentation; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.representations.provider.ScriptProviderDescriptor; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; +import org.keycloak.testsuite.arquillian.annotation.EnableFeature; +import org.keycloak.testsuite.util.ContainerAssume; +import org.keycloak.util.JsonSerialization; + import org.jboss.arquillian.container.test.api.Deployer; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.TargetsContainer; @@ -35,14 +38,13 @@ import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.keycloak.admin.client.resource.ClientResource; -import org.keycloak.representations.idm.ProtocolMapperRepresentation; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.representations.provider.ScriptProviderDescriptor; -import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; -import org.keycloak.testsuite.util.ContainerAssume; -import org.keycloak.util.JsonSerialization; + +import static org.keycloak.common.Profile.Feature.SCRIPTS; +import static org.keycloak.testsuite.admin.ApiUtil.findClientResourceByClientId; +import static org.keycloak.testsuite.arquillian.DeploymentTargetModifier.AUTH_SERVER_CURRENT; +import static org.keycloak.testsuite.util.ProtocolMapperUtil.createScriptMapper; + +import static org.junit.Assert.assertTrue; /** * @author Pedro Igor diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/securityprofile/StrictSecurityProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/securityprofile/StrictSecurityProfileTest.java index 3b8e0d5e251..b57c0671a7c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/securityprofile/StrictSecurityProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/securityprofile/StrictSecurityProfileTest.java @@ -16,15 +16,13 @@ */ package org.keycloak.testsuite.securityprofile; -import jakarta.ws.rs.BadRequestException; -import jakarta.ws.rs.core.Response; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Test; + +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuthErrorException; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.protocol.oidc.OIDCAdvancedConfigWrapper; @@ -43,6 +41,11 @@ import org.keycloak.testsuite.arquillian.annotation.SetDefaultProvider; import org.keycloak.testsuite.auth.page.login.OIDCLogin; import org.keycloak.testsuite.util.ClientBuilder; +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/LastSessionRefreshUnitTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/LastSessionRefreshUnitTest.java index ef21843515e..47fce60a125 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/LastSessionRefreshUnitTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/LastSessionRefreshUnitTest.java @@ -17,9 +17,10 @@ package org.keycloak.testsuite.session; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + import org.keycloak.common.Profile; import org.keycloak.common.util.Retry; import org.keycloak.common.util.Time; @@ -34,9 +35,9 @@ import org.keycloak.testsuite.ProfileAssume; import org.keycloak.testsuite.runonserver.RunOnServer; import org.keycloak.timer.TimerProvider; -import java.util.List; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/SessionTimeoutValidationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/SessionTimeoutValidationTest.java index 9075e5e03d1..88a7e66763d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/SessionTimeoutValidationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/session/SessionTimeoutValidationTest.java @@ -17,10 +17,6 @@ package org.keycloak.testsuite.session; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserManager; @@ -31,6 +27,11 @@ import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + public class SessionTimeoutValidationTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/AbstractUserSessionLimitsBrokerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/AbstractUserSessionLimitsBrokerTest.java index df3a3afec5a..7eb00551779 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/AbstractUserSessionLimitsBrokerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/AbstractUserSessionLimitsBrokerTest.java @@ -1,18 +1,19 @@ package org.keycloak.testsuite.sessionlimits; -import org.junit.Test; import org.keycloak.authentication.authenticators.sessionlimits.UserSessionLimitsAuthenticatorFactory; import org.keycloak.models.AuthenticationFlowModel; import org.keycloak.models.IdentityProviderModel; import org.keycloak.models.RealmModel; import org.keycloak.testsuite.broker.AbstractInitializedBaseBrokerTest; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.junit.Test; +import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.ERROR_TO_DISPLAY; import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.assertSessionCount; import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.configureSessionLimits; -import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.ERROR_TO_DISPLAY; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; public abstract class AbstractUserSessionLimitsBrokerTest extends AbstractInitializedBaseBrokerTest { @Test diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java index 1d9f9291c71..ba4618ea56f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsTest.java @@ -16,10 +16,8 @@ */ package org.keycloak.testsuite.sessionlimits; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; +import jakarta.mail.internet.MimeMessage; + import org.keycloak.authentication.authenticators.browser.CookieAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; import org.keycloak.authentication.authenticators.sessionlimits.UserSessionLimitsAuthenticatorFactory; @@ -39,6 +37,7 @@ import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.forms.BrowserFlowTest; import org.keycloak.testsuite.pages.AppPage; +import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginPasswordResetPage; import org.keycloak.testsuite.pages.LoginPasswordUpdatePage; @@ -46,15 +45,18 @@ import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.util.GreenMailRule; import org.keycloak.testsuite.util.MailUtils; import org.keycloak.testsuite.util.oauth.AccessTokenResponse; -import org.keycloak.testsuite.pages.ErrorPage; -import jakarta.mail.internet.MimeMessage; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; -import static org.junit.Assert.assertEquals; +import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.ERROR_TO_DISPLAY; import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.assertClientSessionCount; import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.assertSessionCount; import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.configureSessionLimits; -import static org.keycloak.testsuite.sessionlimits.UserSessionLimitsUtil.ERROR_TO_DISPLAY; + +import static org.junit.Assert.assertEquals; public class UserSessionLimitsTest extends AbstractTestRealmKeycloakTest { private String realmName = "test"; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsUtil.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsUtil.java index 1b6fab09c89..bac8b7dc80d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/sessionlimits/UserSessionLimitsUtil.java @@ -1,5 +1,8 @@ package org.keycloak.testsuite.sessionlimits; +import java.util.HashMap; +import java.util.Map; + import org.keycloak.authentication.authenticators.sessionlimits.UserSessionLimitsAuthenticatorFactory; import org.keycloak.models.AuthenticationExecutionModel; import org.keycloak.models.AuthenticationFlowModel; @@ -8,9 +11,6 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.testsuite.runonserver.RunOnServer; -import java.util.HashMap; -import java.util.Map; - import static org.junit.Assert.assertEquals; public class UserSessionLimitsUtil { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TLSTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TLSTest.java index 1fab02b6e65..d29ce105a38 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TLSTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TLSTest.java @@ -1,10 +1,5 @@ package org.keycloak.testsuite.ssl; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; - -import org.junit.Assume; -import org.junit.BeforeClass; -import org.junit.Test; import org.keycloak.common.enums.SslRequired; import org.keycloak.jose.jwk.JSONWebKeySet; import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; @@ -13,6 +8,12 @@ import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.util.oauth.OpenIDProviderConfigurationResponse; +import org.junit.Assume; +import org.junit.BeforeClass; +import org.junit.Test; + +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; + /** * This test checks if TLS can be explicitly switched off. * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java index 1cc5625b2d5..79cb0f6feb1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/ssl/TrustStoreEmailTest.java @@ -16,12 +16,6 @@ */ package org.keycloak.testsuite.ssl; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.FixMethodOrder; -import org.junit.Rule; -import org.junit.Test; -import org.junit.runners.MethodSorters; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.common.enums.HostnameVerificationPolicy; import org.keycloak.events.Details; @@ -41,13 +35,21 @@ import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.MailServerConfiguration; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.SslMailServer; +import org.keycloak.testsuite.util.oauth.OAuthClient; + +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.FixMethodOrder; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runners.MethodSorters; -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.util.MailAssert.assertEmailAndGetUrl; import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith; +import static org.junit.Assert.assertEquals; + /** * * @author fkiss diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderTest.java index 5166e65944a..778d72fd0e9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderTest.java @@ -1,11 +1,12 @@ package org.keycloak.testsuite.theme; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.services.resource.AccountResourceProvider; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; +import org.junit.Assert; +import org.junit.Test; + public class CustomAccountResourceProviderTest extends AbstractTestRealmKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomRegistrationTemplateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomRegistrationTemplateTest.java index 4a87a7ea2c8..05ee993c2dd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomRegistrationTemplateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomRegistrationTemplateTest.java @@ -19,21 +19,11 @@ package org.keycloak.testsuite.theme; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; - import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Test; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.representations.userprofile.config.UPAttribute; @@ -44,6 +34,18 @@ import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.RegisterPage; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + public class CustomRegistrationTemplateTest extends AbstractTestRealmKeycloakTest { static final Map CUSTOM_ATTRIBUTES = Map.of("street", "street", diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomUpdateProfileTemplateTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomUpdateProfileTemplateTest.java index 63e5ae771ec..ee6e03c3403 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomUpdateProfileTemplateTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/CustomUpdateProfileTemplateTest.java @@ -19,13 +19,6 @@ package org.keycloak.testsuite.theme; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; - import java.util.AbstractMap.SimpleEntry; import java.util.List; import java.util.Map; @@ -35,9 +28,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import jakarta.ws.rs.core.Response; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.models.Constants; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.RealmRepresentation; @@ -52,6 +43,18 @@ import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginUpdateProfilePage; import org.keycloak.testsuite.util.UserBuilder; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Before; +import org.junit.Test; + +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + public class CustomUpdateProfileTemplateTest extends AbstractTestRealmKeycloakTest { static final Map CUSTOM_ATTRIBUTES = Map.of("street", "street", diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/DefaultThemeManagerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/DefaultThemeManagerTest.java index f9eadb74dd4..95bca965242 100755 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/DefaultThemeManagerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/DefaultThemeManagerTest.java @@ -1,18 +1,19 @@ package org.keycloak.testsuite.theme; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.AbstractKeycloakTest; -import org.keycloak.theme.Theme; - import java.io.IOException; import java.util.List; import java.util.Locale; import java.util.Properties; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.theme.Theme; + +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/ThemeResourceProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/ThemeResourceProviderTest.java index e6df6a44489..bf245704e24 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/ThemeResourceProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/theme/ThemeResourceProviderTest.java @@ -1,5 +1,24 @@ package org.keycloak.testsuite.theme; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Paths; +import java.util.Locale; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.zip.GZIPInputStream; + +import org.keycloak.common.Profile; +import org.keycloak.common.Version; +import org.keycloak.platform.Platform; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; +import org.keycloak.testsuite.arquillian.annotation.EnableFeature; +import org.keycloak.testsuite.arquillian.annotation.EnableFeatures; +import org.keycloak.theme.Theme; + import org.apache.commons.io.IOUtils; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; @@ -10,24 +29,6 @@ import org.hamcrest.CoreMatchers; import org.hamcrest.MatcherAssert; import org.junit.Assert; import org.junit.Test; -import org.keycloak.common.Profile; -import org.keycloak.common.Version; -import org.keycloak.platform.Platform; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.arquillian.annotation.EnableFeature; -import org.keycloak.testsuite.arquillian.annotation.EnableFeatures; -import org.keycloak.theme.Theme; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.Paths; -import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import java.util.zip.GZIPInputStream; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java index 5a5ff0ccdc1..fc6f9b9884e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java @@ -17,11 +17,13 @@ package org.keycloak.testsuite.transactions; -import org.junit.Assert; -import org.junit.Test; +import java.util.List; + import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; -import java.util.List; + +import org.junit.Assert; +import org.junit.Test; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/HostnameV2Test.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/HostnameV2Test.java index b57656fb731..7a4f840eabc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/HostnameV2Test.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/url/HostnameV2Test.java @@ -17,13 +17,9 @@ package org.keycloak.testsuite.url; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.jboss.arquillian.container.spi.client.container.DeployableContainer; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; @@ -32,15 +28,21 @@ import org.keycloak.testsuite.arquillian.containers.RemoteContainer; import org.keycloak.testsuite.broker.util.SimpleHttpDefault; import org.keycloak.testsuite.util.RealmBuilder; -import java.util.ArrayList; -import java.util.List; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; +import org.jboss.arquillian.container.spi.client.container.DeployableContainer; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SCHEME; +import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.util.oauth.OAuthClient.AUTH_SERVER_ROOT; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_PORT; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SCHEME; /** * This is testing just the V2 implementation of Hostname SPI. It is NOT testing if the Hostname SPI as such is used correctly. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/AbstractUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/AbstractUserProfileTest.java index 7549263d06a..ad30904b62d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/AbstractUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/AbstractUserProfileTest.java @@ -33,12 +33,12 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.representations.userprofile.config.UPAttribute; +import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; import org.keycloak.userprofile.UserProfileProvider; -import org.keycloak.representations.userprofile.config.UPAttribute; -import org.keycloak.representations.userprofile.config.UPConfig; import org.keycloak.userprofile.config.UPConfigUtils; import org.keycloak.util.JsonSerialization; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/CustomUserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/CustomUserProfileTest.java index cc89c35069a..eebf409bb7d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/CustomUserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/CustomUserProfileTest.java @@ -19,11 +19,10 @@ package org.keycloak.testsuite.user.profile; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; -import org.junit.Test; import org.keycloak.component.ComponentModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.UserModel; @@ -34,9 +33,11 @@ import org.keycloak.userprofile.UserProfileContext; import org.keycloak.userprofile.UserProfileProvider; import org.keycloak.userprofile.config.UPConfigUtils; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * @author Jörg Matysiak diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UIRealmResourceTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UIRealmResourceTest.java index 4e695a25dfd..2fe12b7b7d4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UIRealmResourceTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UIRealmResourceTest.java @@ -18,28 +18,23 @@ */ package org.keycloak.testsuite.user.profile; +import java.io.IOException; +import java.util.Map; +import java.util.Set; + import jakarta.ws.rs.client.Client; import jakarta.ws.rs.client.Entity; import jakarta.ws.rs.client.WebTarget; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import java.io.IOException; -import java.util.Map; -import java.util.Set; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.Test; + import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.KeycloakBuilder; import org.keycloak.admin.client.resource.BearerAuthFilter; import org.keycloak.admin.client.token.TokenManager; -import org.keycloak.admin.ui.rest.model.UIRealmRepresentation; import org.keycloak.admin.ui.rest.model.UIRealmInfo; +import org.keycloak.admin.ui.rest.model.UIRealmRepresentation; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.AccountRoles; @@ -62,10 +57,19 @@ import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.userprofile.config.UPConfigUtils; import org.keycloak.util.JsonSerialization; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; + +import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UserProfileTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UserProfileTest.java index 17ff46e72e6..ac8bd300777 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UserProfileTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/UserProfileTest.java @@ -19,21 +19,6 @@ package org.keycloak.testsuite.user.profile; -import static java.util.Optional.ofNullable; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; -import static org.keycloak.userprofile.config.UPConfigUtils.parseSystemDefaultConfig; - -import jakarta.ws.rs.core.Response; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -46,9 +31,8 @@ import java.util.Optional; import java.util.Set; import java.util.function.Consumer; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.authentication.requiredactions.TermsAndConditions; import org.keycloak.common.util.MultivaluedHashMap; @@ -66,21 +50,21 @@ import org.keycloak.representations.idm.AbstractUserRepresentation; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.representations.userprofile.config.UPConfig.UnmanagedAttributePolicy; -import org.keycloak.representations.userprofile.config.UPGroup; -import org.keycloak.services.messages.Messages; -import org.keycloak.testsuite.arquillian.annotation.ModelTest; -import org.keycloak.testsuite.runonserver.RunOnServer; -import org.keycloak.userprofile.AttributeGroupMetadata; import org.keycloak.representations.userprofile.config.UPAttribute; import org.keycloak.representations.userprofile.config.UPAttributePermissions; import org.keycloak.representations.userprofile.config.UPAttributeRequired; import org.keycloak.representations.userprofile.config.UPAttributeSelector; import org.keycloak.representations.userprofile.config.UPConfig; +import org.keycloak.representations.userprofile.config.UPConfig.UnmanagedAttributePolicy; +import org.keycloak.representations.userprofile.config.UPGroup; +import org.keycloak.services.messages.Messages; import org.keycloak.testsuite.admin.ApiUtil; +import org.keycloak.testsuite.arquillian.annotation.ModelTest; +import org.keycloak.testsuite.runonserver.RunOnServer; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.ClientScopeBuilder; import org.keycloak.testsuite.util.KeycloakModelUtils; +import org.keycloak.userprofile.AttributeGroupMetadata; import org.keycloak.userprofile.Attributes; import org.keycloak.userprofile.UserProfile; import org.keycloak.userprofile.UserProfileConstants; @@ -97,6 +81,26 @@ import org.keycloak.validate.validators.EmailValidator; import org.keycloak.validate.validators.LengthValidator; import org.keycloak.validate.validators.UriValidator; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Test; + +import static java.util.Optional.ofNullable; + +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; +import static org.keycloak.userprofile.config.UPConfigUtils.parseSystemDefaultConfig; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author Pedro Igor */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/config/UPConfigParserTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/config/UPConfigParserTest.java index a07364f793f..530ec179fe0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/config/UPConfigParserTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/config/UPConfigParserTest.java @@ -16,9 +16,6 @@ */ package org.keycloak.testsuite.user.profile.config; -import static org.keycloak.userprofile.config.UPConfigUtils.readConfig; -import static org.keycloak.userprofile.config.UPConfigUtils.validate; - import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; @@ -28,21 +25,24 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import org.keycloak.testsuite.runonserver.RunOnServer; - -import com.fasterxml.jackson.databind.JsonMappingException; -import org.keycloak.testsuite.util.ClientScopeBuilder; import org.keycloak.representations.userprofile.config.UPAttribute; import org.keycloak.representations.userprofile.config.UPAttributePermissions; import org.keycloak.representations.userprofile.config.UPAttributeRequired; import org.keycloak.representations.userprofile.config.UPConfig; -import org.keycloak.userprofile.config.UPConfigUtils; import org.keycloak.representations.userprofile.config.UPGroup; +import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; +import org.keycloak.testsuite.runonserver.RunOnServer; +import org.keycloak.testsuite.util.ClientScopeBuilder; +import org.keycloak.userprofile.config.UPConfigUtils; + +import com.fasterxml.jackson.databind.JsonMappingException; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.userprofile.config.UPConfigUtils.readConfig; +import static org.keycloak.userprofile.config.UPConfigUtils.validate; /** * Unit test for {@link UPConfigUtils} functionality diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/config/UPConfigUtilsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/config/UPConfigUtilsTest.java index 8bbfa00830e..c7b0f46fa35 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/config/UPConfigUtilsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/user/profile/config/UPConfigUtilsTest.java @@ -16,17 +16,18 @@ */ package org.keycloak.testsuite.user.profile.config; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; -import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; - import java.util.HashSet; import java.util.Set; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.userprofile.UserProfileContext; import org.keycloak.userprofile.config.UPConfigUtils; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_ADMIN; +import static org.keycloak.userprofile.config.UPConfigUtils.ROLE_USER; + /** * Unit test for {@link UPConfigUtils} * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdapterServletDeployment.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdapterServletDeployment.java index 2077d47a03a..7d6156cd7de 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdapterServletDeployment.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdapterServletDeployment.java @@ -16,11 +16,11 @@ */ package org.keycloak.testsuite.util; +import java.net.URL; + import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; -import java.net.URL; - /** * Expects a structure like adapter-test directory * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdminEventPaths.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdminEventPaths.java index 96ec6ff85f7..6c13f2792db 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdminEventPaths.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AdminEventPaths.java @@ -17,6 +17,10 @@ package org.keycloak.testsuite.util; +import java.net.URI; + +import jakarta.ws.rs.core.UriBuilder; + import org.keycloak.admin.client.resource.AttackDetectionResource; import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.ClientAttributeCertificateResource; @@ -39,9 +43,6 @@ import org.keycloak.admin.client.resource.RolesResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.admin.client.resource.UsersResource; -import jakarta.ws.rs.core.UriBuilder; -import java.net.URI; - /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AssertAdminEvents.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AssertAdminEvents.java index e1752f3cbf1..b5b56615749 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AssertAdminEvents.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AssertAdminEvents.java @@ -17,13 +17,13 @@ package org.keycloak.testsuite.util; -import com.fasterxml.jackson.core.type.TypeReference; -import org.hamcrest.Description; -import org.hamcrest.Matcher; -import org.hamcrest.Matchers; -import org.hamcrest.TypeSafeMatcher; -import org.junit.rules.TestRule; -import org.junit.runners.model.Statement; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.keycloak.common.util.ObjectUtil; import org.keycloak.common.util.reflections.Reflections; import org.keycloak.events.admin.OperationType; @@ -39,12 +39,13 @@ import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.Assert; import org.keycloak.util.JsonSerialization; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import com.fasterxml.jackson.core.type.TypeReference; +import org.hamcrest.Description; +import org.hamcrest.Matcher; +import org.hamcrest.Matchers; +import org.hamcrest.TypeSafeMatcher; +import org.junit.rules.TestRule; +import org.junit.runners.model.Statement; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AuthenticatorUtilTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AuthenticatorUtilTest.java index e02392e9cac..c08f5bced7e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AuthenticatorUtilTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/AuthenticatorUtilTest.java @@ -17,8 +17,8 @@ package org.keycloak.testsuite.util; -import org.hamcrest.Matchers; -import org.junit.Test; +import java.util.Set; + import org.keycloak.authentication.AuthenticatorUtil; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; @@ -27,7 +27,8 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.sessions.AuthenticationSessionModel; import org.keycloak.testsuite.AbstractTestRealmKeycloakTest; -import java.util.Set; +import org.hamcrest.Matchers; +import org.junit.Test; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientBuilder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientBuilder.java index 1b69bcbc673..b60bbe39ad7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientBuilder.java @@ -17,9 +17,6 @@ package org.keycloak.testsuite.util; -import org.keycloak.representations.idm.ClientRepresentation; -import org.keycloak.representations.idm.ProtocolMapperRepresentation; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -27,6 +24,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.keycloak.representations.idm.ClientRepresentation; +import org.keycloak.representations.idm.ProtocolMapperRepresentation; + /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java index c29ec68ead0..ca5f5516c54 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientManager.java @@ -1,5 +1,11 @@ package org.keycloak.testsuite.util; +import java.util.Arrays; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; + import org.keycloak.admin.client.resource.ClientResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.models.Constants; @@ -9,12 +15,6 @@ import org.keycloak.representations.idm.ProtocolMapperRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; - import static org.keycloak.testsuite.admin.ApiUtil.findClientByClientId; import static org.keycloak.testsuite.admin.ApiUtil.findProtocolMapperByName; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientPoliciesUtil.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientPoliciesUtil.java index 020f8f6c161..bb1060800f6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientPoliciesUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ClientPoliciesUtil.java @@ -17,9 +17,19 @@ package org.keycloak.testsuite.util; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.security.InvalidAlgorithmParameterException; +import java.security.Key; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.SecureRandom; +import java.security.interfaces.ECPublicKey; +import java.security.spec.ECGenParameterSpec; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; import org.keycloak.common.util.Base64Url; import org.keycloak.common.util.MultivaluedMap; @@ -56,8 +66,8 @@ import org.keycloak.services.clientpolicy.executor.FullScopeDisabledExecutor; import org.keycloak.services.clientpolicy.executor.HolderOfKeyEnforcerExecutor; import org.keycloak.services.clientpolicy.executor.IntentClientBindCheckExecutor; import org.keycloak.services.clientpolicy.executor.PKCEEnforcerExecutor; -import org.keycloak.services.clientpolicy.executor.RejectResourceOwnerPasswordCredentialsGrantExecutor; import org.keycloak.services.clientpolicy.executor.RejectImplicitGrantExecutor; +import org.keycloak.services.clientpolicy.executor.RejectResourceOwnerPasswordCredentialsGrantExecutor; import org.keycloak.services.clientpolicy.executor.SecureClientAuthenticatorExecutor; import org.keycloak.services.clientpolicy.executor.SecureRedirectUrisEnforcerExecutor; import org.keycloak.services.clientpolicy.executor.SecureRequestObjectExecutor; @@ -69,22 +79,13 @@ import org.keycloak.testsuite.services.clientpolicy.executor.TestRaiseExceptionE import org.keycloak.util.DPoPGenerator; import org.keycloak.util.JsonSerialization; -import java.io.IOException; -import java.security.InvalidAlgorithmParameterException; -import java.security.Key; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; -import java.security.PrivateKey; -import java.security.SecureRandom; -import java.security.interfaces.ECPublicKey; -import java.security.spec.ECGenParameterSpec; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +import static org.keycloak.jose.jwk.JWKUtil.toIntegerBytes; import static org.junit.Assert.fail; -import static org.keycloak.jose.jwk.JWKUtil.toIntegerBytes; public final class ClientPoliciesUtil { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/FlowUtil.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/FlowUtil.java index 5ed129612c4..aa370da5a6a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/FlowUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/FlowUtil.java @@ -1,15 +1,5 @@ package org.keycloak.testsuite.util; -import org.keycloak.authentication.AuthenticationFlow; -import org.keycloak.models.AuthenticationExecutionModel; -import org.keycloak.models.AuthenticationExecutionModel.Requirement; -import org.keycloak.models.AuthenticationFlowModel; -import org.keycloak.models.AuthenticatorConfigModel; -import org.keycloak.models.IdentityProviderModel; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.RealmModel; -import org.keycloak.services.resources.admin.AuthenticationManagementResource; - import java.util.HashMap; import java.util.List; import java.util.Map; @@ -22,6 +12,16 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.keycloak.authentication.AuthenticationFlow; +import org.keycloak.models.AuthenticationExecutionModel; +import org.keycloak.models.AuthenticationExecutionModel.Requirement; +import org.keycloak.models.AuthenticationFlowModel; +import org.keycloak.models.AuthenticatorConfigModel; +import org.keycloak.models.IdentityProviderModel; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.services.resources.admin.AuthenticationManagementResource; + import static org.keycloak.models.utils.DefaultAuthenticationFlows.BROWSER_FLOW; import static org.keycloak.models.utils.DefaultAuthenticationFlows.DIRECT_GRANT_FLOW; import static org.keycloak.models.utils.DefaultAuthenticationFlows.FIRST_BROKER_LOGIN_FLOW; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/GroupBuilder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/GroupBuilder.java index 42330034807..3b465b3908c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/GroupBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/GroupBuilder.java @@ -19,6 +19,7 @@ package org.keycloak.testsuite.util; import java.util.List; import java.util.Map; + import org.keycloak.representations.idm.GroupRepresentation; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/InfinispanTestTimeServiceRule.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/InfinispanTestTimeServiceRule.java index 850548e90e4..d6306944378 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/InfinispanTestTimeServiceRule.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/InfinispanTestTimeServiceRule.java @@ -18,9 +18,10 @@ package org.keycloak.testsuite.util; +import org.keycloak.testsuite.AbstractKeycloakTest; + import org.jboss.logging.Logger; import org.junit.rules.ExternalResource; -import org.keycloak.testsuite.AbstractKeycloakTest; /** * @author Marek Posolda diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/JsonTestUtils.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/JsonTestUtils.java index ec41f3fd114..e941057545a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/JsonTestUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/JsonTestUtils.java @@ -21,9 +21,10 @@ package org.keycloak.testsuite.util; import java.io.IOException; -import org.junit.Assert; import org.keycloak.util.JsonSerialization; +import org.junit.Assert; + /** * Utility for comparing JSON objects * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/KeycloakModelUtils.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/KeycloakModelUtils.java index 1770b6b2871..c853a69c774 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/KeycloakModelUtils.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/KeycloakModelUtils.java @@ -17,15 +17,15 @@ package org.keycloak.testsuite.util; +import java.util.Arrays; +import java.util.List; + import org.keycloak.models.UserCredentialModel; import org.keycloak.models.utils.ModelToRepresentation; import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; -import java.util.Arrays; -import java.util.List; - import static org.keycloak.models.utils.KeycloakModelUtils.getDefaultClientAuthenticatorType; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/LogoutTokenUtil.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/LogoutTokenUtil.java index 84f0616fe2e..f7a5433afdd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/LogoutTokenUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/LogoutTokenUtil.java @@ -1,15 +1,5 @@ package org.keycloak.testsuite.util; -import org.keycloak.OAuth2Constants; -import org.keycloak.common.util.Base64Url; -import org.keycloak.common.util.Time; -import org.keycloak.crypto.JavaAlgorithm; -import org.keycloak.jose.jws.Algorithm; -import org.keycloak.jose.jws.JWSHeader; -import org.keycloak.representations.LogoutToken; -import org.keycloak.util.JsonSerialization; -import org.keycloak.util.TokenUtil; - import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; @@ -20,6 +10,16 @@ import java.time.Duration; import java.util.HashMap; import java.util.UUID; +import org.keycloak.OAuth2Constants; +import org.keycloak.common.util.Base64Url; +import org.keycloak.common.util.Time; +import org.keycloak.crypto.JavaAlgorithm; +import org.keycloak.jose.jws.Algorithm; +import org.keycloak.jose.jws.JWSHeader; +import org.keycloak.representations.LogoutToken; +import org.keycloak.util.JsonSerialization; +import org.keycloak.util.TokenUtil; + public class LogoutTokenUtil { public static String generateSignedLogoutToken(PrivateKey privateKey, String keyId, diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java index c40bd287104..9acb3b14cba 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailAssert.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.util; -import org.jboss.logging.Logger; +import java.io.IOException; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import jakarta.mail.internet.MimeMessage.RecipientType; import jakarta.mail.internet.MimeMultipart; -import java.io.IOException; + +import org.jboss.logging.Logger; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java index 362a5224055..23ef6f3fba5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/MailServer.java @@ -17,17 +17,18 @@ package org.keycloak.testsuite.util; -import com.icegreen.greenmail.util.GreenMail; -import com.icegreen.greenmail.util.ServerSetup; -import org.jboss.logging.Logger; +import java.io.IOException; +import java.lang.Thread.UncaughtExceptionHandler; +import java.net.SocketException; import jakarta.mail.MessagingException; import jakarta.mail.internet.MimeMessage; import jakarta.mail.internet.MimeMessage.RecipientType; import jakarta.mail.internet.MimeMultipart; -import java.io.IOException; -import java.lang.Thread.UncaughtExceptionHandler; -import java.net.SocketException; + +import com.icegreen.greenmail.util.GreenMail; +import com.icegreen.greenmail.util.ServerSetup; +import org.jboss.logging.Logger; import static org.keycloak.testsuite.util.MailServerConfiguration.HOST; import static org.keycloak.testsuite.util.MailServerConfiguration.PORT; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/NoCacheAnnotationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/NoCacheAnnotationTest.java index d1c89dad40a..254dcc1c4b0 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/NoCacheAnnotationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/NoCacheAnnotationTest.java @@ -16,14 +16,17 @@ */ package org.keycloak.testsuite.util; -import jakarta.ws.rs.core.Response; import java.util.List; -import org.junit.Assert; -import org.junit.Test; + +import jakarta.ws.rs.core.Response; + import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; +import org.junit.Assert; +import org.junit.Test; + /** * @author Réda Housni Alaoui */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmBuilder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmBuilder.java index 9fa31fbe289..0071240256a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmBuilder.java @@ -17,6 +17,13 @@ package org.keycloak.testsuite.util; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; +import java.util.Set; + import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.ClientScopeRepresentation; import org.keycloak.representations.idm.GroupRepresentation; @@ -26,13 +33,6 @@ import org.keycloak.representations.idm.RolesRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.events.TestEventsListenerProviderFactory; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; -import java.util.Set; - /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java index 9a7183f8926..6831d2460c6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmManager.java @@ -1,5 +1,16 @@ package org.keycloak.testsuite.util; +import java.security.KeyPair; +import java.security.KeyPairGenerator; +import java.security.NoSuchAlgorithmException; +import java.security.cert.Certificate; +import java.security.cert.X509Certificate; +import java.util.Base64; +import java.util.List; +import java.util.stream.Collectors; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.ComponentResource; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.common.util.CertificateUtils; @@ -13,17 +24,6 @@ import org.keycloak.representations.idm.ComponentRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.admin.ApiUtil; -import java.security.KeyPair; -import java.security.KeyPairGenerator; -import java.security.NoSuchAlgorithmException; -import java.security.cert.Certificate; -import java.security.cert.X509Certificate; -import java.util.Base64; -import java.util.List; -import java.util.stream.Collectors; - -import jakarta.ws.rs.core.Response; - /** * @author Bruno Oliveira. */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmRepUtil.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmRepUtil.java index 5d767472bf1..545bfe82c94 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmRepUtil.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RealmRepUtil.java @@ -16,14 +16,14 @@ */ package org.keycloak.testsuite.util; +import java.util.HashSet; +import java.util.Set; + import org.keycloak.representations.idm.ClientRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RoleRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import java.util.HashSet; -import java.util.Set; - /** * * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ReverseProxy.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ReverseProxy.java index 14d1b3f9e32..c02cc43ef3e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ReverseProxy.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/ReverseProxy.java @@ -1,13 +1,14 @@ package org.keycloak.testsuite.util; -import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; -import static org.keycloak.testsuite.arquillian.AuthServerTestEnricher.getHttpAuthServerContextRoot; -import static org.keycloak.testsuite.util.ServerURLs.removeDefaultPorts; +import org.keycloak.testsuite.arquillian.undertow.lb.SimpleUndertowLoadBalancer; import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import org.keycloak.testsuite.arquillian.undertow.lb.SimpleUndertowLoadBalancer; + +import static org.keycloak.testsuite.arquillian.AuthServerTestEnricher.getHttpAuthServerContextRoot; +import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; +import static org.keycloak.testsuite.util.ServerURLs.removeDefaultPorts; public class ReverseProxy implements TestRule { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RoleBuilder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RoleBuilder.java index 3943bc9c1fc..5f2ca9acceb 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RoleBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RoleBuilder.java @@ -17,15 +17,15 @@ package org.keycloak.testsuite.util; -import org.keycloak.representations.idm.RoleRepresentation; -import org.keycloak.representations.idm.RoleRepresentation.Composites; - import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; +import org.keycloak.representations.idm.RoleRepresentation; +import org.keycloak.representations.idm.RoleRepresentation.Composites; + /** * @author Stian Thorgersen */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RolesBuilder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RolesBuilder.java index 1544bd11fb6..69d3f941eea 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RolesBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/RolesBuilder.java @@ -17,13 +17,13 @@ package org.keycloak.testsuite.util; -import org.keycloak.representations.idm.RoleRepresentation; -import org.keycloak.representations.idm.RolesRepresentation; - import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import org.keycloak.representations.idm.RoleRepresentation; +import org.keycloak.representations.idm.RolesRepresentation; + /** * * @author Stan Silvert ssilvert@redhat.com (C) 2016 Red Hat Inc. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java index 3cc116aaf8b..d21e10375f1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/SslMailServer.java @@ -17,15 +17,6 @@ package org.keycloak.testsuite.util; -import org.jboss.logging.Logger; -import org.subethamail.smtp.server.SMTPServer; - -import jakarta.mail.internet.MimeMessage; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocket; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManagerFactory; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -40,6 +31,16 @@ import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; import java.util.HashMap; import java.util.Map; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.SSLSocket; +import javax.net.ssl.SSLSocketFactory; +import javax.net.ssl.TrustManagerFactory; + +import jakarta.mail.internet.MimeMessage; + +import org.jboss.logging.Logger; +import org.subethamail.smtp.server.SMTPServer; import static org.keycloak.testsuite.util.MailServerConfiguration.FROM; import static org.keycloak.testsuite.util.MailServerConfiguration.HOST; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java index 47bfc864e25..41506247318 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestAppHelper.java @@ -19,7 +19,6 @@ package org.keycloak.testsuite.util; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginTotpPage; - import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.oauth.OAuthClient; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestEventsLogger.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestEventsLogger.java index a71aa68ead5..e3aad7f7f20 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestEventsLogger.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TestEventsLogger.java @@ -16,6 +16,10 @@ */ package org.keycloak.testsuite.util; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; + import org.apache.commons.io.FileUtils; import org.jboss.logging.Logger; import org.junit.runner.Description; @@ -23,10 +27,6 @@ import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunListener; import org.openqa.selenium.WebDriver; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; - /** * * @author Petr Mensik diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TextFileCheckerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TextFileCheckerTest.java index 36c57403d13..28dc001115b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TextFileCheckerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/TextFileCheckerTest.java @@ -24,6 +24,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Consumer; import java.util.stream.Stream; + import org.hamcrest.Matchers; import org.junit.After; import org.junit.Before; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UIAssert.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UIAssert.java index db1cd21a11e..04116633c97 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UIAssert.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UIAssert.java @@ -19,12 +19,13 @@ package org.keycloak.testsuite.util; import org.openqa.selenium.WebElement; -import static org.junit.Assert.assertEquals; import static org.keycloak.testsuite.util.UIUtils.ARIA_INVALID_ATTR_NAME; import static org.keycloak.testsuite.util.UIUtils.isElementDisabled; import static org.keycloak.testsuite.util.UIUtils.isElementVisible; import static org.keycloak.testsuite.util.UIUtils.isInputElementValid; +import static org.junit.Assert.assertEquals; + /** * @author Vaclav Muzikar */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/URLAssert.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/URLAssert.java index 64fe5c63229..f14e711a199 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/URLAssert.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/URLAssert.java @@ -17,15 +17,6 @@ package org.keycloak.testsuite.util; -import org.apache.http.Header; -import org.apache.http.HttpEntity; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.awaitility.core.ThrowingRunnable; -import org.junit.Assert; -import org.keycloak.testsuite.auth.page.login.PageWithLoginUrl; -import org.keycloak.testsuite.page.AbstractPage; -import org.openqa.selenium.WebDriver; - import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; @@ -34,12 +25,23 @@ import java.net.URI; import java.nio.charset.Charset; import java.util.concurrent.TimeUnit; -import static org.awaitility.Awaitility.await; -import static org.junit.Assert.assertTrue; +import org.keycloak.testsuite.auth.page.login.PageWithLoginUrl; +import org.keycloak.testsuite.page.AbstractPage; + +import org.apache.http.Header; +import org.apache.http.HttpEntity; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.awaitility.core.ThrowingRunnable; +import org.junit.Assert; +import org.openqa.selenium.WebDriver; + +import static org.keycloak.testsuite.util.ServerURLs.removeDefaultPorts; import static org.keycloak.testsuite.util.URLUtils.currentUrlDoesntStartWith; import static org.keycloak.testsuite.util.URLUtils.currentUrlEquals; import static org.keycloak.testsuite.util.URLUtils.currentUrlStartsWith; -import static org.keycloak.testsuite.util.ServerURLs.removeDefaultPorts; + +import static org.awaitility.Awaitility.await; +import static org.junit.Assert.assertTrue; /** * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserActionTokenBuilder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserActionTokenBuilder.java index 43685cf257c..b93545c66de 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserActionTokenBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserActionTokenBuilder.java @@ -1,11 +1,11 @@ package org.keycloak.testsuite.util; -import org.keycloak.authentication.actiontoken.resetcred.ResetCredentialsActionToken; -import org.keycloak.authentication.actiontoken.verifyemail.VerifyEmailActionToken; - import java.util.HashMap; import java.util.Map; +import org.keycloak.authentication.actiontoken.resetcred.ResetCredentialsActionToken; +import org.keycloak.authentication.actiontoken.verifyemail.VerifyEmailActionToken; + /** * @author Bruno Oliveira */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserFederationProviderBuilder.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserFederationProviderBuilder.java index 1f11dd2151a..61f45c76a99 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserFederationProviderBuilder.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserFederationProviderBuilder.java @@ -17,11 +17,11 @@ package org.keycloak.testsuite.util; -import org.keycloak.representations.idm.UserFederationProviderRepresentation; - import java.util.HashMap; import java.util.Map; +import org.keycloak.representations.idm.UserFederationProviderRepresentation; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserManager.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserManager.java index 6bd37896964..e6134db06db 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserManager.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/UserManager.java @@ -1,12 +1,12 @@ package org.keycloak.testsuite.util; +import java.util.ArrayList; +import java.util.Arrays; + import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.representations.idm.UserRepresentation; -import java.util.ArrayList; -import java.util.Arrays; - import static org.keycloak.testsuite.admin.ApiUtil.findUserByUsernameId; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/BuiltinValidatorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/BuiltinValidatorsTest.java index 5de22f1e969..f2687c2f7ae 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/BuiltinValidatorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/BuiltinValidatorsTest.java @@ -19,8 +19,6 @@ package org.keycloak.testsuite.validation; -import static org.keycloak.validate.ValidatorConfig.configFromMap; - import java.net.URI; import java.net.URL; import java.util.ArrayList; @@ -29,14 +27,13 @@ import java.util.Collections; import java.util.List; import java.util.regex.Pattern; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; import org.keycloak.userprofile.validator.MultiValueValidator; import org.keycloak.validate.AbstractSimpleValidator; +import org.keycloak.validate.BuiltinValidators; import org.keycloak.validate.ValidationContext; import org.keycloak.validate.ValidationError; import org.keycloak.validate.ValidationResult; @@ -48,10 +45,13 @@ import org.keycloak.validate.validators.IntegerValidator; import org.keycloak.validate.validators.LengthValidator; import org.keycloak.validate.validators.OptionsValidator; import org.keycloak.validate.validators.PatternValidator; -import org.keycloak.validate.BuiltinValidators; import org.keycloak.validate.validators.UriValidator; import com.google.common.collect.ImmutableMap; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.validate.ValidatorConfig.configFromMap; public class BuiltinValidatorsTest extends AbstractKeycloakTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/ValidatorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/ValidatorTest.java index ccfe834bc59..57205d3fcbd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/ValidatorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/ValidatorTest.java @@ -19,7 +19,9 @@ package org.keycloak.testsuite.validation; -import org.junit.Test; +import java.util.Collections; +import java.util.Locale; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; @@ -29,8 +31,7 @@ import org.keycloak.testsuite.runonserver.RunOnServer; import org.keycloak.validate.BuiltinValidators; import org.keycloak.validate.ValidationContext; -import java.util.Collections; -import java.util.Locale; +import org.junit.Test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/ValidatorsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/ValidatorsTest.java index 9dea81d78af..e145db4bc94 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/ValidatorsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/validation/ValidatorsTest.java @@ -19,8 +19,6 @@ package org.keycloak.testsuite.validation; -import static org.keycloak.validate.ValidatorConfig.configFromMap; - import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; @@ -30,12 +28,11 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.models.KeycloakSession; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; import org.keycloak.testsuite.arquillian.annotation.ModelTest; +import org.keycloak.validate.BuiltinValidators; import org.keycloak.validate.SimpleValidator; import org.keycloak.validate.ValidationContext; import org.keycloak.validate.ValidationError; @@ -46,9 +43,13 @@ import org.keycloak.validate.Validators; import org.keycloak.validate.validators.EmailValidator; import org.keycloak.validate.validators.LengthValidator; import org.keycloak.validate.validators.NotBlankValidator; -import org.keycloak.validate.BuiltinValidators; import org.keycloak.validate.validators.ValidatorConfigValidator; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.validate.ValidatorConfig.configFromMap; + public class ValidatorsTest extends AbstractKeycloakTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/AbstractKeycloakVaultTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/AbstractKeycloakVaultTest.java index d4bae135787..e70dd9012d1 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/AbstractKeycloakVaultTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/AbstractKeycloakVaultTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.vault; -import org.jetbrains.annotations.NotNull; -import org.junit.Assert; +import java.util.List; +import java.util.Optional; + import org.keycloak.models.KeycloakSession; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.AbstractKeycloakTest; @@ -27,8 +28,8 @@ import org.keycloak.testsuite.utils.io.IOUtil; import org.keycloak.vault.VaultStringSecret; import org.keycloak.vault.VaultTranscriber; -import java.util.List; -import java.util.Optional; +import org.jetbrains.annotations.NotNull; +import org.junit.Assert; /** * Tests the usage of the {@link VaultTranscriber} on the server side. The tests attempt to obtain the transcriber from diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakKeystoreVaultTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakKeystoreVaultTest.java index d7b2038a4c0..d21041f4d40 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakKeystoreVaultTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakKeystoreVaultTest.java @@ -17,10 +17,11 @@ package org.keycloak.testsuite.vault; -import org.junit.Test; import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.vault.VaultTranscriber; +import org.junit.Test; + /** * Tests the usage of the {@link VaultTranscriber} on the server side. The tests attempt to obtain the transcriber from * the session and then use it to obtain secrets from the configured provider. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakPlaintextVaultTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakPlaintextVaultTest.java index b2d651bb3d0..4b3c5cccbc4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakPlaintextVaultTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/vault/KeycloakPlaintextVaultTest.java @@ -17,10 +17,11 @@ package org.keycloak.testsuite.vault; -import org.junit.Test; import org.keycloak.testsuite.arquillian.annotation.EnableVault; import org.keycloak.vault.VaultTranscriber; +import org.junit.Test; + /** * Tests the usage of the {@link VaultTranscriber} on the server side. The tests attempt to obtain the transcriber from * the session and then use it to obtain secrets from the configured provider. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java index 0f60a0e14e1..1c3e92c9c3c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AbstractWebAuthnVirtualTest.java @@ -17,10 +17,16 @@ package org.keycloak.testsuite.webauthn; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; +import java.security.spec.PKCS8EncodedKeySpec; +import java.util.Base64; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; + +import jakarta.ws.rs.core.Response; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.WebAuthnPasswordlessAuthenticatorFactory; @@ -34,9 +40,9 @@ import org.keycloak.representations.idm.AuthenticationFlowRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RequiredActionProviderRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.AbstractChangeImportedUserPasswordsTest; import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.AbstractAdminTest; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.pages.ErrorPage; @@ -56,28 +62,25 @@ import org.keycloak.testsuite.webauthn.updaters.AbstractWebAuthnRealmUpdater; import org.keycloak.testsuite.webauthn.updaters.PasswordLessRealmAttributeUpdater; import org.keycloak.testsuite.webauthn.updaters.WebAuthnRealmAttributeUpdater; import org.keycloak.testsuite.webauthn.utils.WebAuthnRealmData; + +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; import org.openqa.selenium.WebDriver; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.virtualauthenticator.Credential; import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; -import jakarta.ws.rs.core.Response; -import java.security.spec.PKCS8EncodedKeySpec; -import java.util.Base64; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; +import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverFirefox; +import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverInstanceOf; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverFirefox; -import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverInstanceOf; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; /** * Abstract class for WebAuthn tests which use Virtual Authenticators diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnSkipIfExistsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnSkipIfExistsTest.java index 9601fea4809..74adf2c5a31 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnSkipIfExistsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnSkipIfExistsTest.java @@ -17,11 +17,13 @@ package org.keycloak.testsuite.webauthn; import java.io.IOException; -import org.junit.Test; + import org.keycloak.models.Constants; import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; + +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java index 30504609959..896ef1ecf5f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/AppInitiatedActionWebAuthnTest.java @@ -16,11 +16,13 @@ */ package org.keycloak.testsuite.webauthn; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.function.Supplier; +import java.util.stream.Collectors; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; @@ -41,31 +43,31 @@ import org.keycloak.testsuite.pages.LoginUsernameOnlyPage; import org.keycloak.testsuite.pages.PasswordPage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.FlowUtil; -import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.util.SecondBrowser; +import org.keycloak.testsuite.util.oauth.OAuthClient; import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; import org.keycloak.testsuite.webauthn.authenticators.UseVirtualAuthenticators; import org.keycloak.testsuite.webauthn.authenticators.VirtualAuthenticatorManager; import org.keycloak.testsuite.webauthn.pages.WebAuthnRegisterPage; + +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.openqa.selenium.WebDriver; import org.openqa.selenium.firefox.FirefoxDriver; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.function.Supplier; -import java.util.stream.Collectors; +import static org.keycloak.models.AuthenticationExecutionModel.Requirement.ALTERNATIVE; +import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUIRED; +import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverFirefox; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.keycloak.models.AuthenticationExecutionModel.Requirement.ALTERNATIVE; -import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUIRED; -import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverFirefox; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; /** * @author Martin Bartos diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/VirtualAuthenticatorsManagerTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/VirtualAuthenticatorsManagerTest.java index 6443cdbdae4..cda6b0a76de 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/VirtualAuthenticatorsManagerTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/VirtualAuthenticatorsManagerTest.java @@ -16,15 +16,16 @@ */ package org.keycloak.testsuite.webauthn; -import org.hamcrest.Matchers; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.junit.Test; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.util.SecondBrowser; import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; import org.keycloak.testsuite.webauthn.authenticators.KcVirtualAuthenticator; import org.keycloak.testsuite.webauthn.authenticators.VirtualAuthenticatorManager; + +import org.hamcrest.Matchers; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.junit.Test; import org.openqa.selenium.WebDriver; import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnFeatureTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnFeatureTest.java index 2dc1106b598..1517d6d8cef 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnFeatureTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnFeatureTest.java @@ -18,13 +18,14 @@ package org.keycloak.testsuite.webauthn; -import org.junit.Test; import org.keycloak.authentication.AuthenticatorSpi; import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorFactory; import org.keycloak.common.Profile; import org.keycloak.testsuite.arquillian.annotation.DisableFeature; import org.keycloak.testsuite.feature.AbstractFeatureStateTest; +import org.junit.Test; + public class WebAuthnFeatureTest extends AbstractFeatureStateTest { @Override diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnIdlessTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnIdlessTest.java index d9e431f213d..0d3a405e876 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnIdlessTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnIdlessTest.java @@ -16,10 +16,11 @@ */ package org.keycloak.testsuite.webauthn; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.logging.Logger; -import org.junit.Rule; -import org.junit.Test; +import java.io.IOException; +import java.util.List; +import java.util.function.Predicate; +import java.util.stream.Collectors; + import org.keycloak.WebAuthnConstants; import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; @@ -31,32 +32,37 @@ import org.keycloak.authentication.requiredactions.WebAuthnRegisterFactory; import org.keycloak.common.util.SecretGenerator; import org.keycloak.events.Details; import org.keycloak.events.EventType; -import org.keycloak.models.Constants; import org.keycloak.models.AuthenticationExecutionModel; +import org.keycloak.models.Constants; import org.keycloak.models.credential.WebAuthnCredentialModel; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.EventRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.AbstractAdminTest; +import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.pages.AppPage; +import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.pages.ErrorPage; import org.keycloak.testsuite.pages.LoginPage; import org.keycloak.testsuite.pages.LoginUsernameOnlyPage; import org.keycloak.testsuite.pages.SelectAuthenticatorPage; -import org.keycloak.testsuite.pages.AppPage.RequestType; import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.webauthn.pages.WebAuthnLoginPage; import org.keycloak.testsuite.webauthn.pages.WebAuthnRegisterPage; + +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.logging.Logger; +import org.junit.Rule; +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; -import java.io.IOException; -import java.util.List; -import java.util.function.Predicate; -import java.util.stream.Collectors; +import static org.keycloak.models.AuthenticationExecutionModel.Requirement.ALTERNATIVE; +import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUIRED; +import static org.keycloak.testsuite.webauthn.utils.PropertyRequirement.NO; +import static org.keycloak.testsuite.webauthn.utils.PropertyRequirement.YES; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; @@ -64,10 +70,6 @@ import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.models.AuthenticationExecutionModel.Requirement.ALTERNATIVE; -import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUIRED; -import static org.keycloak.testsuite.webauthn.utils.PropertyRequirement.NO; -import static org.keycloak.testsuite.webauthn.utils.PropertyRequirement.YES; import static org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions.Protocol; import static org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions.Transport; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnPropertyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnPropertyTest.java index 396634f6197..f72bbe9a6ce 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnPropertyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnPropertyTest.java @@ -17,7 +17,10 @@ package org.keycloak.testsuite.webauthn; -import org.junit.Test; +import java.io.Closeable; +import java.io.IOException; +import java.util.Objects; + import org.keycloak.WebAuthnConstants; import org.keycloak.models.Constants; import org.keycloak.models.credential.WebAuthnCredentialModel; @@ -26,19 +29,18 @@ import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.webauthn.utils.WebAuthnRealmData; + +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; -import java.io.Closeable; -import java.io.IOException; -import java.util.Objects; +import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT; +import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_RESIDENT_KEY; +import static org.keycloak.testsuite.webauthn.utils.PropertyRequirement.YES; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT; -import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_RESIDENT_KEY; -import static org.keycloak.testsuite.webauthn.utils.PropertyRequirement.YES; /** * @author Martin Bartos diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnRegisterAndLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnRegisterAndLoginTest.java index c7eac86bb78..bfb5bd9d0fe 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnRegisterAndLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnRegisterAndLoginTest.java @@ -16,11 +16,14 @@ */ package org.keycloak.testsuite.webauthn; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Objects; + import jakarta.ws.rs.core.Response; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.WebAuthnConstants; import org.keycloak.admin.client.resource.RealmResource; import org.keycloak.admin.client.resource.UserResource; @@ -52,21 +55,21 @@ import org.keycloak.testsuite.util.FlowUtil; import org.keycloak.testsuite.webauthn.pages.WebAuthnAuthenticatorsList; import org.keycloak.testsuite.webauthn.updaters.WebAuthnRealmAttributeUpdater; import org.keycloak.util.JsonSerialization; + +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Objects; +import static org.keycloak.models.AuthenticationExecutionModel.Requirement.ALTERNATIVE; +import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUIRED; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.models.AuthenticationExecutionModel.Requirement.ALTERNATIVE; -import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUIRED; public class WebAuthnRegisterAndLoginTest extends AbstractWebAuthnVirtualTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnTransportsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnTransportsTest.java index 5c50a1a9e38..f93bbfaa433 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnTransportsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/WebAuthnTransportsTest.java @@ -17,22 +17,24 @@ package org.keycloak.testsuite.webauthn; -import org.junit.Test; +import java.util.List; + import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.webauthn.pages.WebAuthnAuthenticatorsList; + +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; -import java.util.List; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_BLE; import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_INTERNAL; import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_NFC; import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_USB; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + /** * @author Martin Bartos */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/AbstractWebAuthnAccountTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/AbstractWebAuthnAccountTest.java index 01c66193cb3..dd7eeab2138 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/AbstractWebAuthnAccountTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/AbstractWebAuthnAccountTest.java @@ -17,9 +17,8 @@ package org.keycloak.testsuite.webauthn.account; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Before; +import jakarta.ws.rs.ClientErrorException; + import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorFactory; import org.keycloak.authentication.authenticators.browser.WebAuthnPasswordlessAuthenticatorFactory; @@ -33,8 +32,6 @@ import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.RequiredActionProviderSimpleRepresentation; import org.keycloak.testsuite.AbstractAuthTest; import org.keycloak.testsuite.page.AbstractPatternFlyAlert; -import org.keycloak.testsuite.webauthn.pages.SigningInPage; -import org.keycloak.testsuite.webauthn.utils.SigningInPageUtils; import org.keycloak.testsuite.pages.DeleteCredentialPage; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; import org.keycloak.testsuite.util.FlowUtil; @@ -42,22 +39,27 @@ import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; import org.keycloak.testsuite.webauthn.authenticators.UseVirtualAuthenticators; import org.keycloak.testsuite.webauthn.authenticators.VirtualAuthenticatorManager; +import org.keycloak.testsuite.webauthn.pages.SigningInPage; import org.keycloak.testsuite.webauthn.pages.WebAuthnErrorPage; import org.keycloak.testsuite.webauthn.pages.WebAuthnLoginPage; import org.keycloak.testsuite.webauthn.pages.WebAuthnRegisterPage; +import org.keycloak.testsuite.webauthn.utils.SigningInPageUtils; + +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Before; import org.openqa.selenium.Dimension; import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; -import jakarta.ws.rs.ClientErrorException; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.models.AuthenticationExecutionModel.Requirement.REQUIRED; import static org.keycloak.testsuite.admin.Users.setPasswordFor; import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverFirefox; import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + public abstract class AbstractWebAuthnAccountTest extends AbstractAuthTest implements UseVirtualAuthenticators { @Page diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnErrorTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnErrorTest.java index 6cd9be2e991..e74a628a868 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnErrorTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnErrorTest.java @@ -17,9 +17,8 @@ package org.keycloak.testsuite.webauthn.account; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Test; +import java.io.IOException; + import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.updaters.RealmAttributeUpdater; @@ -28,9 +27,11 @@ import org.keycloak.testsuite.webauthn.pages.WebAuthnAuthenticatorsList; import org.keycloak.testsuite.webauthn.pages.WebAuthnErrorPage; import org.keycloak.testsuite.webauthn.pages.WebAuthnLoginPage; import org.keycloak.testsuite.webauthn.updaters.WebAuthnRealmAttributeUpdater; -import org.openqa.selenium.firefox.FirefoxDriver; -import java.io.IOException; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Test; +import org.openqa.selenium.firefox.FirefoxDriver; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnSigningInTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnSigningInTest.java index 32b1c3d2b3b..1ec8707b1ca 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnSigningInTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnSigningInTest.java @@ -17,8 +17,18 @@ package org.keycloak.testsuite.webauthn.account; -import org.hamcrest.Matchers; -import org.junit.Test; +import java.io.Closeable; +import java.io.IOException; +import java.text.DateFormat; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.Objects; +import java.util.function.Consumer; +import java.util.stream.Collectors; + import org.keycloak.admin.client.resource.UserResource; import org.keycloak.authentication.requiredactions.WebAuthnPasswordlessRegisterFactory; import org.keycloak.authentication.requiredactions.WebAuthnRegisterFactory; @@ -34,21 +44,18 @@ import org.keycloak.testsuite.webauthn.updaters.AbstractWebAuthnRealmUpdater; import org.keycloak.testsuite.webauthn.updaters.PasswordLessRealmAttributeUpdater; import org.keycloak.testsuite.webauthn.updaters.WebAuthnRealmAttributeUpdater; import org.keycloak.theme.DateTimeFormatterUtil; + +import org.hamcrest.Matchers; +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; -import java.io.Closeable; -import java.io.IOException; -import java.text.DateFormat; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Locale; -import java.util.Objects; -import java.util.function.Consumer; -import java.util.stream.Collectors; - import static java.util.Collections.emptyList; + +import static org.keycloak.testsuite.util.UIUtils.refreshPageAndWaitForLoad; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; +import static org.keycloak.testsuite.webauthn.utils.SigningInPageUtils.assertUserCredential; +import static org.keycloak.testsuite.webauthn.utils.SigningInPageUtils.testSetUpLink; + import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; @@ -56,10 +63,6 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.hasSize; -import static org.keycloak.testsuite.webauthn.utils.SigningInPageUtils.assertUserCredential; -import static org.keycloak.testsuite.webauthn.utils.SigningInPageUtils.testSetUpLink; -import static org.keycloak.testsuite.util.UIUtils.refreshPageAndWaitForLoad; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; public class WebAuthnSigningInTest extends AbstractWebAuthnAccountTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnTransportLocaleTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnTransportLocaleTest.java index 16b0de4d185..4211d1126d5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnTransportLocaleTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/account/WebAuthnTransportLocaleTest.java @@ -17,14 +17,6 @@ package org.keycloak.testsuite.webauthn.account; -import org.hamcrest.Matchers; -import org.junit.Test; -import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; -import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; -import org.keycloak.testsuite.webauthn.pages.WebAuthnAuthenticatorsList; -import org.openqa.selenium.firefox.FirefoxDriver; -import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; - import java.io.Closeable; import java.io.IOException; import java.util.List; @@ -33,15 +25,25 @@ import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Supplier; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; +import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; +import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; +import org.keycloak.testsuite.webauthn.pages.WebAuthnAuthenticatorsList; + +import org.hamcrest.Matchers; +import org.junit.Test; +import org.openqa.selenium.firefox.FirefoxDriver; +import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; + import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT; import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_BLE; import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_INTERNAL; import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_NFC; import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_USB; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + /** * Test for checking localization for authenticator transport media name * diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/AppInitiatedActionPwdLessSkipIfExistsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/AppInitiatedActionPwdLessSkipIfExistsTest.java index e7c976a4cb8..03dac879dd7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/AppInitiatedActionPwdLessSkipIfExistsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/AppInitiatedActionPwdLessSkipIfExistsTest.java @@ -17,12 +17,13 @@ package org.keycloak.testsuite.webauthn.passwordless; -import org.junit.Before; import org.keycloak.testsuite.util.BrowserDriverUtil; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.AppInitiatedActionWebAuthnSkipIfExistsTest; import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; +import org.junit.Before; + /** * @author rmartinc */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/AppInitiatedActionPwdLessTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/AppInitiatedActionPwdLessTest.java index 430aba21230..de6826595ba 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/AppInitiatedActionPwdLessTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/AppInitiatedActionPwdLessTest.java @@ -17,12 +17,13 @@ package org.keycloak.testsuite.webauthn.passwordless; -import org.junit.Before; import org.keycloak.testsuite.util.BrowserDriverUtil; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.AppInitiatedActionWebAuthnTest; import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; +import org.junit.Before; + /** * @author Martin Bartos */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysConditionalUITest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysConditionalUITest.java index 0745a5fdf6d..8a895178c7f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysConditionalUITest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysConditionalUITest.java @@ -20,9 +20,7 @@ package org.keycloak.testsuite.webauthn.passwordless; import java.io.Closeable; import java.io.IOException; import java.util.List; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Test; + import org.keycloak.WebAuthnConstants; import org.keycloak.authentication.authenticators.browser.PasskeysConditionalUIAuthenticatorFactory; import org.keycloak.common.Profile; @@ -38,6 +36,10 @@ import org.keycloak.testsuite.pages.PageUtils; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysDefaultBrowserFlowTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysDefaultBrowserFlowTest.java index 5baea9c8231..6428cfc8c24 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysDefaultBrowserFlowTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysDefaultBrowserFlowTest.java @@ -19,11 +19,7 @@ package org.keycloak.testsuite.webauthn.passwordless; import java.io.Closeable; import java.util.List; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import static org.hamcrest.Matchers.nullValue; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Test; + import org.keycloak.WebAuthnConstants; import org.keycloak.events.Details; import org.keycloak.models.Constants; @@ -40,9 +36,16 @@ import org.keycloak.testsuite.pages.LoginTotpPage; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.firefox.FirefoxDriver; +import static org.hamcrest.Matchers.nullValue; + /** * * @author rmartinc diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysKcOidcFirstBrokerLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysKcOidcFirstBrokerLoginTest.java index 36576685434..a191c2c97a5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysKcOidcFirstBrokerLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysKcOidcFirstBrokerLoginTest.java @@ -19,11 +19,7 @@ package org.keycloak.testsuite.webauthn.passwordless; import java.io.IOException; import java.util.Optional; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.authentication.requiredactions.WebAuthnPasswordlessRegisterFactory; import org.keycloak.models.IdentityProviderSyncMode; @@ -50,6 +46,12 @@ import org.keycloak.testsuite.webauthn.authenticators.VirtualAuthenticatorManage import org.keycloak.testsuite.webauthn.pages.WebAuthnErrorPage; import org.keycloak.testsuite.webauthn.pages.WebAuthnLoginPage; import org.keycloak.testsuite.webauthn.pages.WebAuthnRegisterPage; + +import org.jboss.arquillian.graphene.page.Page; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.firefox.FirefoxDriver; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysOrganizationAuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysOrganizationAuthenticationTest.java index 70a23f08ead..a36e553a074 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysOrganizationAuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysOrganizationAuthenticationTest.java @@ -19,9 +19,7 @@ package org.keycloak.testsuite.webauthn.passwordless; import java.io.Closeable; import java.io.IOException; import java.util.List; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Test; + import org.keycloak.WebAuthnConstants; import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; import org.keycloak.events.Details; @@ -38,13 +36,17 @@ import org.keycloak.representations.idm.OrganizationDomainRepresentation; import org.keycloak.representations.idm.OrganizationRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AbstractAdminTest; +import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.firefox.FirefoxDriver; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernameFormTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernameFormTest.java index a5deec254b4..ba2ce563434 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernameFormTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernameFormTest.java @@ -20,9 +20,7 @@ package org.keycloak.testsuite.webauthn.passwordless; import java.io.Closeable; import java.io.IOException; import java.util.List; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.junit.Test; + import org.keycloak.WebAuthnConstants; import org.keycloak.authentication.authenticators.browser.PasswordFormFactory; import org.keycloak.authentication.authenticators.browser.UsernameFormFactory; @@ -39,13 +37,17 @@ import org.keycloak.representations.idm.AuthenticationFlowRepresentation; import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.representations.idm.RealmRepresentation; import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.AbstractAdminTest; +import org.keycloak.testsuite.Assert; import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.firefox.FirefoxDriver; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernamePasswordFormTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernamePasswordFormTest.java index 6bd6318489c..b7b0a8bd84f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernamePasswordFormTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/PasskeysUsernamePasswordFormTest.java @@ -20,11 +20,7 @@ package org.keycloak.testsuite.webauthn.passwordless; import java.io.Closeable; import java.io.IOException; import java.util.List; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Assert; -import org.junit.Test; + import org.keycloak.WebAuthnConstants; import org.keycloak.authentication.authenticators.browser.UsernamePasswordFormFactory; import org.keycloak.events.Details; @@ -42,6 +38,12 @@ import org.keycloak.testsuite.pages.SelectOrganizationPage; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions; + +import org.hamcrest.MatcherAssert; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Assert; +import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.NoSuchElementException; import org.openqa.selenium.firefox.FirefoxDriver; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/WebAuthnPwdLessPropertyTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/WebAuthnPwdLessPropertyTest.java index d7e83e22a79..f9e076dd5ea 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/WebAuthnPwdLessPropertyTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/passwordless/WebAuthnPwdLessPropertyTest.java @@ -17,10 +17,11 @@ package org.keycloak.testsuite.webauthn.passwordless; -import org.junit.Ignore; -import org.junit.Test; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.webauthn.WebAuthnPropertyTest; + +import org.junit.Ignore; +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/AttestationConveyanceRegisterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/AttestationConveyanceRegisterTest.java index d7198b14668..c9cf2012cde 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/AttestationConveyanceRegisterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/AttestationConveyanceRegisterTest.java @@ -17,29 +17,31 @@ package org.keycloak.testsuite.webauthn.registration; -import com.webauthn4j.data.AttestationConveyancePreference; -import com.webauthn4j.data.attestation.statement.NoneAttestationStatement; -import com.webauthn4j.data.attestation.statement.PackedAttestationStatement; -import org.junit.Test; +import java.io.IOException; + import org.keycloak.models.credential.dto.WebAuthnCredentialData; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.updaters.AbstractWebAuthnRealmUpdater; import org.keycloak.testsuite.webauthn.utils.WebAuthnDataWrapper; import org.keycloak.testsuite.webauthn.utils.WebAuthnRealmData; + +import com.webauthn4j.data.AttestationConveyancePreference; +import com.webauthn4j.data.attestation.statement.NoneAttestationStatement; +import com.webauthn4j.data.attestation.statement.PackedAttestationStatement; +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.virtualauthenticator.Credential; -import java.io.IOException; +import static org.keycloak.models.Constants.DEFAULT_WEBAUTHN_POLICY_NOT_SPECIFIED; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; +import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertTrue; -import static org.keycloak.models.Constants.DEFAULT_WEBAUTHN_POLICY_NOT_SPECIFIED; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; -import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT; /** * @author Martin Bartos diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/AuthAttachmentRegisterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/AuthAttachmentRegisterTest.java index 3bf2109b5e3..f50b92e4663 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/AuthAttachmentRegisterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/AuthAttachmentRegisterTest.java @@ -16,25 +16,27 @@ */ package org.keycloak.testsuite.webauthn.registration; -import com.webauthn4j.data.AuthenticatorAttachment; -import com.webauthn4j.data.UserVerificationRequirement; -import org.junit.Test; -import org.junit.Ignore; +import java.io.Closeable; +import java.io.IOException; + import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.utils.WebAuthnRealmData; + +import com.webauthn4j.data.AuthenticatorAttachment; +import com.webauthn4j.data.UserVerificationRequirement; +import org.junit.Ignore; +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; -import java.io.Closeable; -import java.io.IOException; +import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_BLE; +import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_INTERNAL; +import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_USB; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_BLE; -import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_INTERNAL; -import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_USB; /** * @author Martin Bartos diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/PolicyJsInjectionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/PolicyJsInjectionTest.java index 34f91e4b3e6..d4d78ee2bcd 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/PolicyJsInjectionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/PolicyJsInjectionTest.java @@ -17,9 +17,11 @@ package org.keycloak.testsuite.webauthn.registration; -import org.hamcrest.Matchers; -import org.junit.Test; -import org.junit.Ignore; +import java.io.Closeable; +import java.io.IOException; +import java.util.function.Consumer; +import java.util.function.Function; + import org.keycloak.representations.idm.CredentialRepresentation; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; @@ -27,12 +29,11 @@ import org.keycloak.testsuite.webauthn.pages.WebAuthnAuthenticatorsList; import org.keycloak.testsuite.webauthn.updaters.AbstractWebAuthnRealmUpdater; import org.keycloak.testsuite.webauthn.utils.WebAuthnRealmData; import org.keycloak.utils.StringUtil; -import org.openqa.selenium.firefox.FirefoxDriver; -import java.io.Closeable; -import java.io.IOException; -import java.util.function.Consumer; -import java.util.function.Function; +import org.hamcrest.Matchers; +import org.junit.Ignore; +import org.junit.Test; +import org.openqa.selenium.firefox.FirefoxDriver; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/PubKeySignRegisterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/PubKeySignRegisterTest.java index f71aa490eba..59146be9f30 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/PubKeySignRegisterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/PubKeySignRegisterTest.java @@ -16,30 +16,32 @@ */ package org.keycloak.testsuite.webauthn.registration; -import com.webauthn4j.data.attestation.authenticator.COSEKey; -import com.webauthn4j.data.attestation.statement.COSEAlgorithmIdentifier; -import org.junit.Test; -import org.keycloak.models.credential.dto.WebAuthnCredentialData; -import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; -import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; -import org.keycloak.testsuite.webauthn.utils.WebAuthnDataWrapper; -import org.keycloak.testsuite.webauthn.utils.WebAuthnRealmData; -import org.openqa.selenium.firefox.FirefoxDriver; - import java.io.Closeable; import java.io.IOException; import java.util.Collections; import java.util.List; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; -import static org.hamcrest.MatcherAssert.assertThat; +import org.keycloak.models.credential.dto.WebAuthnCredentialData; +import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; +import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; +import org.keycloak.testsuite.webauthn.utils.WebAuthnDataWrapper; +import org.keycloak.testsuite.webauthn.utils.WebAuthnRealmData; + +import com.webauthn4j.data.attestation.authenticator.COSEKey; +import com.webauthn4j.data.attestation.statement.COSEAlgorithmIdentifier; +import org.junit.Test; +import org.openqa.selenium.firefox.FirefoxDriver; + import static org.keycloak.crypto.Algorithm.ES256; import static org.keycloak.crypto.Algorithm.ES512; import static org.keycloak.crypto.Algorithm.RS384; import static org.keycloak.crypto.Algorithm.RS512; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; + /** * @author Martin Bartos */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/ResidentKeyRegisterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/ResidentKeyRegisterTest.java index 5df3ba20aa4..8cf2389ff44 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/ResidentKeyRegisterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/ResidentKeyRegisterTest.java @@ -17,27 +17,29 @@ package org.keycloak.testsuite.webauthn.registration; -import org.hamcrest.Matchers; -import org.junit.Test; +import java.io.Closeable; +import java.io.IOException; +import java.util.List; + import org.keycloak.testsuite.admin.ApiUtil; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.utils.PropertyRequirement; import org.keycloak.testsuite.webauthn.utils.WebAuthnRealmData; + +import org.hamcrest.Matchers; +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.virtualauthenticator.Credential; -import java.io.Closeable; -import java.io.IOException; -import java.util.List; +import static org.keycloak.models.Constants.DEFAULT_WEBAUTHN_POLICY_NOT_SPECIFIED; +import static org.keycloak.models.Constants.WEBAUTHN_POLICY_OPTION_REQUIRED; +import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_RESIDENT_KEY; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.models.Constants.DEFAULT_WEBAUTHN_POLICY_NOT_SPECIFIED; -import static org.keycloak.models.Constants.WEBAUTHN_POLICY_OPTION_REQUIRED; -import static org.keycloak.testsuite.webauthn.authenticators.DefaultVirtualAuthOptions.DEFAULT_RESIDENT_KEY; /** * @author Martin Bartos diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/UserVerificationRegisterTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/UserVerificationRegisterTest.java index d5220fa2351..bf2b6a20477 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/UserVerificationRegisterTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/UserVerificationRegisterTest.java @@ -17,19 +17,20 @@ package org.keycloak.testsuite.webauthn.registration; -import com.webauthn4j.data.UserVerificationRequirement; -import org.junit.Test; +import java.io.Closeable; +import java.io.IOException; +import java.util.function.Consumer; + import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.utils.WebAuthnRealmData; + +import com.webauthn4j.data.UserVerificationRequirement; +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.virtualauthenticator.VirtualAuthenticatorOptions; -import java.io.Closeable; -import java.io.IOException; -import java.util.function.Consumer; - import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/WebAuthnOtherSettingsTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/WebAuthnOtherSettingsTest.java index 8862c554cd3..5d8c0ec83ba 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/WebAuthnOtherSettingsTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/WebAuthnOtherSettingsTest.java @@ -17,13 +17,12 @@ package org.keycloak.testsuite.webauthn.registration; -import com.webauthn4j.data.AttestationConveyancePreference; -import com.webauthn4j.data.attestation.authenticator.COSEKey; -import com.webauthn4j.data.attestation.statement.COSEAlgorithmIdentifier; -import com.webauthn4j.data.attestation.statement.COSEKeyType; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.junit.Test; +import java.io.Closeable; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Optional; + import org.keycloak.WebAuthnConstants; import org.keycloak.authentication.requiredactions.WebAuthnPasswordlessRegisterFactory; import org.keycloak.authentication.requiredactions.WebAuthnRegisterFactory; @@ -37,13 +36,19 @@ import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.testsuite.webauthn.AbstractWebAuthnVirtualTest; import org.keycloak.testsuite.webauthn.utils.WebAuthnDataWrapper; import org.keycloak.testsuite.webauthn.utils.WebAuthnRealmData; + +import com.webauthn4j.data.AttestationConveyancePreference; +import com.webauthn4j.data.attestation.authenticator.COSEKey; +import com.webauthn4j.data.attestation.statement.COSEAlgorithmIdentifier; +import com.webauthn4j.data.attestation.statement.COSEKeyType; +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.junit.Test; import org.openqa.selenium.firefox.FirefoxDriver; -import java.io.Closeable; -import java.io.IOException; -import java.util.Collections; -import java.util.List; -import java.util.Optional; +import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverFirefox; +import static org.keycloak.testsuite.util.WaitUtils.pause; +import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.anyOf; @@ -52,9 +57,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.util.BrowserDriverUtil.isDriverFirefox; -import static org.keycloak.testsuite.util.WaitUtils.pause; -import static org.keycloak.testsuite.util.WaitUtils.waitForPageToLoad; /** * @author Martin Bartos diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessAttestationRegTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessAttestationRegTest.java index 291bd8c4c37..ddb54a1bf16 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessAttestationRegTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessAttestationRegTest.java @@ -19,6 +19,7 @@ package org.keycloak.testsuite.webauthn.registration.passwordless; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.webauthn.registration.AttestationConveyanceRegisterTest; + import org.openqa.selenium.firefox.FirefoxDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessAuthAttachmentRegTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessAuthAttachmentRegTest.java index ef949a5cd4d..a33e019bbb4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessAuthAttachmentRegTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessAuthAttachmentRegTest.java @@ -19,6 +19,7 @@ package org.keycloak.testsuite.webauthn.registration.passwordless; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.webauthn.registration.AuthAttachmentRegisterTest; + import org.openqa.selenium.firefox.FirefoxDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessPubKeySignRegTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessPubKeySignRegTest.java index 19de1a499eb..9b305f6ff72 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessPubKeySignRegTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessPubKeySignRegTest.java @@ -19,6 +19,7 @@ package org.keycloak.testsuite.webauthn.registration.passwordless; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.webauthn.registration.PubKeySignRegisterTest; + import org.openqa.selenium.firefox.FirefoxDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessResidentKeyRegTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessResidentKeyRegTest.java index 90fb1fef255..3555c460571 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessResidentKeyRegTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessResidentKeyRegTest.java @@ -19,6 +19,7 @@ package org.keycloak.testsuite.webauthn.registration.passwordless; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.webauthn.registration.ResidentKeyRegisterTest; + import org.openqa.selenium.firefox.FirefoxDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessUserVerRegTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessUserVerRegTest.java index 63db552cdc9..df6f9239fd2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessUserVerRegTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/webauthn/registration/passwordless/PwdLessUserVerRegTest.java @@ -19,6 +19,7 @@ package org.keycloak.testsuite.webauthn.registration.passwordless; import org.keycloak.testsuite.arquillian.annotation.IgnoreBrowserDriver; import org.keycloak.testsuite.webauthn.registration.UserVerificationRegisterTest; + import org.openqa.selenium.firefox.FirefoxDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java index ad88a153be4..508bf21a614 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/AbstractX509AuthenticationTest.java @@ -18,16 +18,18 @@ package org.keycloak.testsuite.x509; +import java.lang.reflect.Field; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + import jakarta.ws.rs.core.Response; -import org.hamcrest.Matchers; -import org.jboss.arquillian.graphene.page.Page; -import org.jboss.logging.Logger; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; + import org.keycloak.admin.client.resource.AuthenticationManagementResource; import org.keycloak.admin.client.resource.UserProfileResource; import org.keycloak.authentication.AuthenticationFlow; @@ -67,20 +69,18 @@ import org.keycloak.testsuite.util.RealmBuilder; import org.keycloak.testsuite.util.UserBuilder; import org.keycloak.testsuite.util.WaitUtils; import org.keycloak.userprofile.UserProfileConstants; + +import org.hamcrest.Matchers; +import org.jboss.arquillian.graphene.page.Page; +import org.jboss.logging.Logger; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; import org.openqa.selenium.WebDriver; -import java.lang.reflect.Field; -import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static org.hamcrest.Matchers.emptyOrNullString; -import static org.hamcrest.Matchers.is; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USERNAME_EMAIL; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USER_ATTRIBUTE; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.ISSUERDN; @@ -95,6 +95,9 @@ import static org.keycloak.testsuite.drone.KeycloakDronePostSetup.HTML_UNIT_SSL_ import static org.keycloak.testsuite.util.ServerURLs.AUTH_SERVER_SSL_REQUIRED; import static org.keycloak.utils.StringUtil.isBlank; +import static org.hamcrest.Matchers.emptyOrNullString; +import static org.hamcrest.Matchers.is; + /** * @author Peter Nalyvayko * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/OcspHandler.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/OcspHandler.java index 2a72b950f92..679089577f5 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/OcspHandler.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/OcspHandler.java @@ -29,7 +29,11 @@ import java.util.Date; import java.util.Map; import com.google.common.collect.ImmutableMap; - +import io.undertow.io.Sender; +import io.undertow.server.HttpHandler; +import io.undertow.server.HttpServerExchange; +import io.undertow.util.HeaderMap; +import io.undertow.util.Headers; import org.bouncycastle.asn1.ASN1OctetString; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.nist.NISTObjectIdentifiers; @@ -62,12 +66,6 @@ import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder; import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; -import io.undertow.io.Sender; -import io.undertow.server.HttpHandler; -import io.undertow.server.HttpServerExchange; -import io.undertow.util.HeaderMap; -import io.undertow.util.Headers; - final class OcspHandler implements HttpHandler { // certificates created by the same ca than the client certs diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserCRLTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserCRLTest.java index 88db2e6878a..82fe8214c3f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserCRLTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserCRLTest.java @@ -17,11 +17,6 @@ package org.keycloak.testsuite.x509; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.junit.Assert; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Test; import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel; import org.keycloak.events.Details; import org.keycloak.models.Constants; @@ -30,13 +25,20 @@ import org.keycloak.testsuite.pages.AppPage; import org.keycloak.testsuite.util.AccountHelper; import org.keycloak.testsuite.util.ContainerAssume; import org.keycloak.testsuite.util.HtmlUnitBrowser; + +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; import org.openqa.selenium.WebDriver; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USERNAME_EMAIL; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN_EMAIL; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; + /** * @author Marek Posolda */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginIssuerDnTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginIssuerDnTest.java index d3eeafc5853..e2a76907551 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginIssuerDnTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginIssuerDnTest.java @@ -21,13 +21,14 @@ import java.security.NoSuchProviderException; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; +import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.util.HtmlUnitBrowser; + import org.jboss.arquillian.drone.api.annotation.Drone; import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.util.HtmlUnitBrowser; import org.openqa.selenium.WebDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginSubjectAltNameTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginSubjectAltNameTest.java index 3648f916bdc..c6734668f74 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginSubjectAltNameTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginSubjectAltNameTest.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.x509; +import org.keycloak.testsuite.util.HtmlUnitBrowser; + import org.jboss.arquillian.drone.api.annotation.Drone; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.keycloak.testsuite.util.HtmlUnitBrowser; import org.openqa.selenium.WebDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginSubjectDnTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginSubjectDnTest.java index be196b018f2..7bb6ff62f49 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginSubjectDnTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginSubjectDnTest.java @@ -17,12 +17,13 @@ package org.keycloak.testsuite.x509; +import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.util.HtmlUnitBrowser; + import org.jboss.arquillian.drone.api.annotation.Drone; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.keycloak.representations.idm.UserRepresentation; -import org.keycloak.testsuite.util.HtmlUnitBrowser; import org.openqa.selenium.WebDriver; /** diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java index 068a8c5df85..8dd5e5c6ec4 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509BrowserLoginTest.java @@ -18,36 +18,37 @@ package org.keycloak.testsuite.x509; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.keycloak.testsuite.AssertEvents; -import org.keycloak.testsuite.util.HtmlUnitBrowser; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel; import org.keycloak.events.Details; import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; import org.keycloak.representations.idm.UserRepresentation; +import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.pages.AppPage; +import org.keycloak.testsuite.util.DroneUtils; +import org.keycloak.testsuite.util.HtmlUnitBrowser; -import jakarta.ws.rs.core.Response; +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.openqa.selenium.WebDriver; +import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USERNAME_EMAIL; +import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USER_ATTRIBUTE; +import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SERIALNUMBER; +import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SERIALNUMBER_ISSUERDN; +import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SHA256_THUMBPRINT; +import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN; +import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN_EMAIL; + +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USERNAME_EMAIL; -import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USER_ATTRIBUTE; -import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SERIALNUMBER_ISSUERDN; -import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SHA256_THUMBPRINT; -import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SERIALNUMBER; -import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN; -import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN_EMAIL; - -import org.keycloak.testsuite.util.DroneUtils; -import org.openqa.selenium.WebDriver; /** * @author Peter Nalyvayko diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509DirectGrantTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509DirectGrantTest.java index 78b9bc1e88a..19dc3c6e827 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509DirectGrantTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509DirectGrantTest.java @@ -18,11 +18,8 @@ package org.keycloak.testsuite.x509; -import org.jboss.arquillian.drone.api.annotation.Drone; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import jakarta.ws.rs.core.Response; + import org.keycloak.OAuth2Constants; import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel; import org.keycloak.events.Details; @@ -33,20 +30,25 @@ import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; import org.keycloak.representations.idm.UserRepresentation; import org.keycloak.testsuite.AssertEvents; import org.keycloak.testsuite.util.ContainerAssume; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.keycloak.testsuite.util.HtmlUnitBrowser; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import org.jboss.arquillian.drone.api.annotation.Drone; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; import org.openqa.selenium.WebDriver; -import jakarta.ws.rs.core.Response; - -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USERNAME_EMAIL; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USER_ATTRIBUTE; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.ISSUERDN; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN_EMAIL; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; + /** * @author Peter Nalyvayko * @version $Revision: 1 $ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderFailOpenTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderFailOpenTest.java index 5a64b505a24..45e17d3db6f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderFailOpenTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderFailOpenTest.java @@ -1,28 +1,31 @@ package org.keycloak.testsuite.x509; -import io.undertow.Undertow; +import java.nio.charset.StandardCharsets; +import java.nio.file.Paths; + import jakarta.ws.rs.core.Response; + +import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel; +import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; +import org.keycloak.testsuite.util.HtmlUnitBrowser; +import org.keycloak.testsuite.util.MutualTLSUtils; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import io.undertow.Undertow; import org.apache.commons.io.IOUtils; import org.apache.http.impl.client.CloseableHttpClient; import org.jboss.arquillian.drone.api.annotation.Drone; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel; -import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; -import org.keycloak.testsuite.util.HtmlUnitBrowser; -import org.keycloak.testsuite.util.MutualTLSUtils; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; import org.openqa.selenium.WebDriver; -import java.nio.charset.StandardCharsets; -import java.nio.file.Paths; +import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USERNAME_EMAIL; +import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN_EMAIL; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; -import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USERNAME_EMAIL; -import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN_EMAIL; public class X509OCSPResponderFailOpenTest extends AbstractX509AuthenticationTest { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderSpecificCertTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderSpecificCertTest.java index 9bf59d904b5..cad86330be7 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderSpecificCertTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderSpecificCertTest.java @@ -18,27 +18,28 @@ package org.keycloak.testsuite.x509; +import jakarta.ws.rs.core.Response; + +import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel; +import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; +import org.keycloak.testsuite.util.HtmlUnitBrowser; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import io.undertow.Undertow; +import io.undertow.server.handlers.BlockingHandler; import org.jboss.arquillian.drone.api.annotation.Drone; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel; -import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.openqa.selenium.WebDriver; -import jakarta.ws.rs.core.Response; - -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USERNAME_EMAIL; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN_EMAIL; -import io.undertow.Undertow; -import io.undertow.server.handlers.BlockingHandler; -import org.keycloak.testsuite.util.HtmlUnitBrowser; -import org.openqa.selenium.WebDriver; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; /** * Verifies Certificate revocation using OCSP responder but specifying specific diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderTest.java index 1c2d8ff8aec..695f01fd16a 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509OCSPResponderTest.java @@ -18,34 +18,35 @@ package org.keycloak.testsuite.x509; +import java.nio.charset.StandardCharsets; +import java.nio.file.Paths; + +import jakarta.ws.rs.core.Response; + +import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel; +import org.keycloak.common.util.PemUtils; +import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; +import org.keycloak.testsuite.util.HtmlUnitBrowser; +import org.keycloak.testsuite.util.MutualTLSUtils; +import org.keycloak.testsuite.util.oauth.AccessTokenResponse; + +import io.undertow.Undertow; +import io.undertow.server.handlers.BlockingHandler; +import org.apache.commons.io.IOUtils; +import org.apache.http.impl.client.CloseableHttpClient; import org.jboss.arquillian.drone.api.annotation.Drone; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel; -import org.keycloak.common.util.PemUtils; -import org.keycloak.representations.idm.AuthenticatorConfigRepresentation; -import org.keycloak.testsuite.util.MutualTLSUtils; -import org.keycloak.testsuite.util.oauth.AccessTokenResponse; +import org.openqa.selenium.WebDriver; -import jakarta.ws.rs.core.Response; - -import static org.hamcrest.Matchers.containsString; -import static org.junit.Assert.assertEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType.USERNAME_EMAIL; import static org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType.SUBJECTDN_EMAIL; -import io.undertow.Undertow; -import io.undertow.server.handlers.BlockingHandler; - -import java.nio.charset.StandardCharsets; -import java.nio.file.Paths; -import org.apache.commons.io.IOUtils; -import org.apache.http.impl.client.CloseableHttpClient; -import org.keycloak.testsuite.util.HtmlUnitBrowser; -import org.openqa.selenium.WebDriver; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsString; +import static org.junit.Assert.assertEquals; /** * Verifies Certificate revocation using OCSP responder. diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509SingleCertificateBrowserCRLTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509SingleCertificateBrowserCRLTest.java index 73bc8053c7c..37e669448cc 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509SingleCertificateBrowserCRLTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/x509/X509SingleCertificateBrowserCRLTest.java @@ -16,15 +16,16 @@ */ package org.keycloak.testsuite.x509; +import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel; +import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType; +import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType; +import org.keycloak.testsuite.util.HtmlUnitBrowser; + import org.jboss.arquillian.drone.api.annotation.Drone; import org.junit.Before; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Test; -import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel; -import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.IdentityMapperType; -import org.keycloak.authentication.authenticators.x509.X509AuthenticatorConfigModel.MappingSourceType; -import org.keycloak.testsuite.util.HtmlUnitBrowser; import org.openqa.selenium.WebDriver; /** diff --git a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/DeploymentArchiveProcessorUtils.java b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/DeploymentArchiveProcessorUtils.java index 7826fe1b1dd..aff4b238649 100644 --- a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/DeploymentArchiveProcessorUtils.java +++ b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/DeploymentArchiveProcessorUtils.java @@ -16,19 +16,6 @@ */ package org.keycloak.testsuite.utils.arquillian; -import org.jboss.logging.Logger; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.Node; -import org.jboss.shrinkwrap.api.asset.Asset; -import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.keycloak.representations.adapters.config.AdapterConfig; -import org.keycloak.testsuite.utils.io.IOUtil; -import org.keycloak.util.JsonSerialization; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -36,6 +23,20 @@ import java.util.Arrays; import java.util.Collection; import java.util.Optional; +import org.keycloak.representations.adapters.config.AdapterConfig; +import org.keycloak.testsuite.utils.io.IOUtil; +import org.keycloak.util.JsonSerialization; + +import org.jboss.logging.Logger; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.Node; +import org.jboss.shrinkwrap.api.asset.Asset; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; + import static org.keycloak.testsuite.util.ServerURLs.getAppServerContextRoot; import static org.keycloak.testsuite.util.ServerURLs.getAuthServerContextRoot; import static org.keycloak.testsuite.utils.io.IOUtil.modifyDocElementAttribute; diff --git a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/KeycloakDependenciesResolver.java b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/KeycloakDependenciesResolver.java index a788b7617a5..c6f5dd5b57a 100644 --- a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/KeycloakDependenciesResolver.java +++ b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/arquillian/KeycloakDependenciesResolver.java @@ -16,16 +16,16 @@ */ package org.keycloak.testsuite.utils.arquillian; +import java.io.File; +import java.util.HashMap; +import java.util.Map; + import org.jboss.logging.Logger; import org.jboss.shrinkwrap.resolver.api.maven.Maven; import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStage; import org.jboss.shrinkwrap.resolver.api.maven.ScopeType; import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenDependencies; -import java.io.File; -import java.util.HashMap; -import java.util.Map; - /** * @author mhajas */ diff --git a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/io/IOUtil.java b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/io/IOUtil.java index 56640137e31..7991e39b28b 100644 --- a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/io/IOUtil.java +++ b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/io/IOUtil.java @@ -16,25 +16,6 @@ */ package org.keycloak.testsuite.utils.io; -import org.jboss.logging.Logger; -import org.keycloak.representations.idm.RealmRepresentation; -import org.keycloak.util.JsonSerialization; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.SAXException; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.Result; -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -46,6 +27,26 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.StringWriter; import java.util.concurrent.TimeUnit; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.util.JsonSerialization; + +import org.jboss.logging.Logger; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; /** * diff --git a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/tls/TLSUtils.java b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/tls/TLSUtils.java index 658e39a87df..89dfa840e07 100644 --- a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/tls/TLSUtils.java +++ b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/tls/TLSUtils.java @@ -1,15 +1,15 @@ package org.keycloak.testsuite.utils.tls; +import java.io.FileInputStream; +import java.nio.file.Paths; +import java.security.KeyStore; +import java.security.cert.X509Certificate; import javax.net.ssl.KeyManager; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; -import java.io.FileInputStream; -import java.nio.file.Paths; -import java.security.KeyStore; -import java.security.cert.X509Certificate; public class TLSUtils { diff --git a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/SimpleWebXmlParser.java b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/SimpleWebXmlParser.java index 45f0623399d..96bf77da8ef 100644 --- a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/SimpleWebXmlParser.java +++ b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/SimpleWebXmlParser.java @@ -22,7 +22,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; - import jakarta.servlet.DispatcherType; import jakarta.servlet.Filter; import jakarta.servlet.Servlet; diff --git a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/UndertowDeployerHelper.java b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/UndertowDeployerHelper.java index d8d71ed3f8c..c837417f232 100644 --- a/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/UndertowDeployerHelper.java +++ b/testsuite/integration-arquillian/util/src/main/java/org/keycloak/testsuite/utils/undertow/UndertowDeployerHelper.java @@ -16,6 +16,20 @@ */ package org.keycloak.testsuite.utils.undertow; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; +import java.util.HashMap; +import java.util.Map; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import jakarta.servlet.Servlet; +import jakarta.servlet.annotation.WebServlet; + import io.undertow.UndertowMessages; import io.undertow.jsp.HackInstanceManager; import io.undertow.jsp.JspServletBuilder; @@ -36,19 +50,6 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import org.w3c.dom.Document; import org.xml.sax.SAXException; -import jakarta.servlet.Servlet; -import jakarta.servlet.annotation.WebServlet; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.net.URLConnection; -import java.net.URLStreamHandler; -import java.util.HashMap; -import java.util.Map; - /** * @author Marek Posolda */ diff --git a/testsuite/model/src/main/java/org/keycloak/testsuite/model/Config.java b/testsuite/model/src/main/java/org/keycloak/testsuite/model/Config.java index 3ca275d167c..c8d03c5fc42 100644 --- a/testsuite/model/src/main/java/org/keycloak/testsuite/model/Config.java +++ b/testsuite/model/src/main/java/org/keycloak/testsuite/model/Config.java @@ -16,18 +16,18 @@ */ package org.keycloak.testsuite.model; -import org.keycloak.Config.ConfigProvider; -import org.keycloak.Config.Scope; -import org.keycloak.Config.SystemPropertiesScope; -import org.keycloak.common.util.StringPropertyReplacer; -import org.keycloak.common.util.SystemEnvProperties; - import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.BooleanSupplier; import java.util.stream.Collectors; +import org.keycloak.Config.ConfigProvider; +import org.keycloak.Config.Scope; +import org.keycloak.Config.SystemPropertiesScope; +import org.keycloak.common.util.StringPropertyReplacer; +import org.keycloak.common.util.SystemEnvProperties; + /** * * @author hmlnarik diff --git a/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java b/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java index 8b1bc4fe794..b9b5e9e25a5 100644 --- a/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java +++ b/testsuite/model/src/main/java/org/keycloak/testsuite/model/HotRodServerRule.java @@ -5,6 +5,10 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; +import org.keycloak.Config; +import org.keycloak.connections.infinispan.InfinispanUtil; +import org.keycloak.marshalling.Marshalling; + import org.infinispan.client.hotrod.RemoteCacheManager; import org.infinispan.commons.api.CacheContainerAdmin; import org.infinispan.commons.dataconversion.MediaType; @@ -19,9 +23,6 @@ import org.infinispan.server.hotrod.configuration.HotRodServerConfigurationBuild import org.infinispan.transaction.LockingMode; import org.infinispan.transaction.TransactionMode; import org.junit.rules.ExternalResource; -import org.keycloak.Config; -import org.keycloak.connections.infinispan.InfinispanUtil; -import org.keycloak.marshalling.Marshalling; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.ACTION_TOKEN_CACHE; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.AUTHENTICATION_SESSIONS_CACHE_NAME; diff --git a/testsuite/model/src/main/java/org/keycloak/testsuite/model/KeycloakModelParameters.java b/testsuite/model/src/main/java/org/keycloak/testsuite/model/KeycloakModelParameters.java index 5c0a137cb53..de5f3a308c9 100644 --- a/testsuite/model/src/main/java/org/keycloak/testsuite/model/KeycloakModelParameters.java +++ b/testsuite/model/src/main/java/org/keycloak/testsuite/model/KeycloakModelParameters.java @@ -16,10 +16,12 @@ */ package org.keycloak.testsuite.model; -import org.keycloak.provider.ProviderFactory; -import org.keycloak.provider.Spi; import java.util.Set; import java.util.stream.Stream; + +import org.keycloak.provider.ProviderFactory; +import org.keycloak.provider.Spi; + import org.junit.runner.Description; import org.junit.runners.model.Statement; diff --git a/testsuite/model/src/main/java/org/keycloak/testsuite/model/RequireProvider.java b/testsuite/model/src/main/java/org/keycloak/testsuite/model/RequireProvider.java index b500d71d1f9..7a3ac19ecf7 100644 --- a/testsuite/model/src/main/java/org/keycloak/testsuite/model/RequireProvider.java +++ b/testsuite/model/src/main/java/org/keycloak/testsuite/model/RequireProvider.java @@ -16,13 +16,14 @@ */ package org.keycloak.testsuite.model; -import org.keycloak.provider.Provider; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.keycloak.provider.Provider; + /** * Identifies a requirement for a given provider to be present in the session factory. * If the provider is not available, the test is skipped. diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/DBLockTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/DBLockTest.java index c9dea3eabed..07c04bfed40 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/DBLockTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/DBLockTest.java @@ -22,10 +22,6 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.IntStream; -import org.jboss.logging.Logger; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.dblock.DBLockManager; @@ -33,6 +29,11 @@ import org.keycloak.models.dblock.DBLockProvider; import org.keycloak.models.dblock.DBLockProviderFactory; import org.keycloak.models.utils.KeycloakModelUtils; +import org.jboss.logging.Logger; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + /** * @author Marek Posolda */ diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/FederatedIdentityModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/FederatedIdentityModelTest.java index 223916c2b87..4bd01ad2b8a 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/FederatedIdentityModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/FederatedIdentityModelTest.java @@ -16,13 +16,9 @@ */ package org.keycloak.testsuite.model; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; - import java.util.ArrayList; import java.util.List; -import org.junit.Test; + import org.keycloak.broker.provider.IdentityProvider; import org.keycloak.broker.provider.IdentityProviderFactory; import org.keycloak.models.Constants; @@ -34,6 +30,12 @@ import org.keycloak.models.UserModel; import org.keycloak.provider.ProviderEventListener; import org.keycloak.testsuite.broker.oidc.TestKeycloakOidcIdentityProviderFactory; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; + /** * @author Réda Housni Alaoui */ diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/KeycloakModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/KeycloakModelTest.java index 13272c6e92b..059455f555e 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/KeycloakModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/KeycloakModelTest.java @@ -16,50 +16,6 @@ */ package org.keycloak.testsuite.model; -import org.junit.Assert; -import org.keycloak.Config.Scope; -import org.keycloak.authorization.AuthorizationSpi; -import org.keycloak.authorization.DefaultAuthorizationProviderFactory; -import org.keycloak.authorization.policy.provider.PolicyProviderFactory; -import org.keycloak.authorization.policy.provider.PolicySpi; -import org.keycloak.authorization.store.StoreFactorySpi; -import org.keycloak.cluster.ClusterSpi; -import org.keycloak.common.Profile; -import org.keycloak.common.profile.PropertiesProfileConfigResolver; -import org.keycloak.common.util.Time; -import org.keycloak.component.ComponentFactoryProviderFactory; -import org.keycloak.component.ComponentFactorySpi; -import org.keycloak.events.EventStoreSpi; -import org.keycloak.executors.DefaultExecutorsProviderFactory; -import org.keycloak.executors.ExecutorsSpi; -import org.keycloak.models.AbstractKeycloakTransaction; -import org.keycloak.models.ClientScopeSpi; -import org.keycloak.models.ClientSpi; -import org.keycloak.models.GroupSpi; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.RealmModel; -import org.keycloak.models.RealmSpi; -import org.keycloak.models.RoleSpi; -import org.keycloak.models.DeploymentStateSpi; -import org.keycloak.models.UserLoginFailureSpi; -import org.keycloak.models.UserSessionSpi; -import org.keycloak.models.UserSpi; -import org.keycloak.models.utils.KeycloakModelUtils; -import org.keycloak.models.utils.PostMigrationEvent; -import org.keycloak.provider.Provider; -import org.keycloak.provider.ProviderFactory; -import org.keycloak.provider.ProviderManager; -import org.keycloak.provider.Spi; -import org.keycloak.services.DefaultComponentFactoryProviderFactory; -import org.keycloak.services.DefaultKeycloakSessionFactory; -import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; -import org.keycloak.spi.infinispan.CacheRemoteConfigProviderFactory; -import org.keycloak.spi.infinispan.CacheRemoteConfigProviderSpi; -import org.keycloak.storage.DatastoreProviderFactory; -import org.keycloak.storage.DatastoreSpi; -import org.keycloak.timer.TimerSpi; - import java.lang.management.LockInfo; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; @@ -90,9 +46,57 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; + +import org.keycloak.Config.Scope; +import org.keycloak.authorization.AuthorizationSpi; +import org.keycloak.authorization.DefaultAuthorizationProviderFactory; +import org.keycloak.authorization.policy.provider.PolicyProviderFactory; +import org.keycloak.authorization.policy.provider.PolicySpi; +import org.keycloak.authorization.store.StoreFactorySpi; +import org.keycloak.cluster.ClusterSpi; +import org.keycloak.common.Profile; +import org.keycloak.common.profile.PropertiesProfileConfigResolver; +import org.keycloak.common.util.Time; +import org.keycloak.component.ComponentFactoryProviderFactory; +import org.keycloak.component.ComponentFactorySpi; +import org.keycloak.events.EventStoreSpi; +import org.keycloak.executors.DefaultExecutorsProviderFactory; +import org.keycloak.executors.ExecutorsSpi; +import org.keycloak.models.AbstractKeycloakTransaction; +import org.keycloak.models.ClientScopeSpi; +import org.keycloak.models.ClientSpi; +import org.keycloak.models.DeploymentStateProviderFactory; +import org.keycloak.models.DeploymentStateSpi; +import org.keycloak.models.GroupSpi; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.RealmModel; +import org.keycloak.models.RealmSpi; +import org.keycloak.models.RoleSpi; +import org.keycloak.models.UserLoginFailureSpi; +import org.keycloak.models.UserSessionSpi; +import org.keycloak.models.UserSpi; +import org.keycloak.models.utils.KeycloakModelUtils; +import org.keycloak.models.utils.PostMigrationEvent; +import org.keycloak.provider.Provider; +import org.keycloak.provider.ProviderFactory; +import org.keycloak.provider.ProviderManager; +import org.keycloak.provider.Spi; +import org.keycloak.services.DefaultComponentFactoryProviderFactory; +import org.keycloak.services.DefaultKeycloakSessionFactory; +import org.keycloak.services.resteasy.ResteasyKeycloakSessionFactory; +import org.keycloak.spi.infinispan.CacheRemoteConfigProviderFactory; +import org.keycloak.spi.infinispan.CacheRemoteConfigProviderSpi; +import org.keycloak.storage.DatastoreProviderFactory; +import org.keycloak.storage.DatastoreSpi; +import org.keycloak.timer.TimerSpi; +import org.keycloak.tracing.TracingProviderFactory; +import org.keycloak.tracing.TracingSpi; + import org.hamcrest.Matchers; import org.jboss.logging.Logger; import org.junit.After; +import org.junit.Assert; import org.junit.Assume; import org.junit.AssumptionViolatedException; import org.junit.Before; @@ -103,9 +107,6 @@ import org.junit.rules.TestRule; import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import org.keycloak.models.DeploymentStateProviderFactory; -import org.keycloak.tracing.TracingProviderFactory; -import org.keycloak.tracing.TracingSpi; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/MigrationModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/MigrationModelTest.java index 611a443c686..397d44ae182 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/MigrationModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/MigrationModelTest.java @@ -17,9 +17,9 @@ package org.keycloak.testsuite.model; import java.util.List; + import jakarta.persistence.EntityManager; -import org.jboss.logging.Logger; -import org.junit.Test; + import org.keycloak.common.Version; import org.keycloak.connections.jpa.JpaConnectionProvider; import org.keycloak.migration.MigrationModel; @@ -34,6 +34,9 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RealmProvider; import org.keycloak.models.jpa.entities.MigrationModelEntity; +import org.jboss.logging.Logger; +import org.junit.Test; + import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/MultiSiteProfileTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/MultiSiteProfileTest.java index eb952a7ec43..8535c502dc0 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/MultiSiteProfileTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/MultiSiteProfileTest.java @@ -1,6 +1,5 @@ package org.keycloak.testsuite.model; -import org.junit.Test; import org.keycloak.common.Profile; import org.keycloak.models.SingleUseObjectProvider; import org.keycloak.models.UserLoginFailureProvider; @@ -11,6 +10,8 @@ import org.keycloak.models.sessions.infinispan.remote.RemoteInfinispanSingleUseO import org.keycloak.models.sessions.infinispan.remote.RemoteUserLoginFailureProvider; import org.keycloak.sessions.AuthenticationSessionProvider; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assume.assumeTrue; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/RealmModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/RealmModelTest.java index 049851e8c4b..83a23aa759a 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/RealmModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/RealmModelTest.java @@ -16,7 +16,10 @@ */ package org.keycloak.testsuite.model; -import org.junit.Test; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.ResourceServer; import org.keycloak.models.ClientModel; @@ -28,9 +31,7 @@ import org.keycloak.models.RealmProvider; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.provider.ProviderEventListener; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; +import org.junit.Test; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/TimeOffsetTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/TimeOffsetTest.java index 575dca66702..9579471390c 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/TimeOffsetTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/TimeOffsetTest.java @@ -16,7 +16,6 @@ */ package org.keycloak.testsuite.model; -import org.junit.Test; import org.keycloak.common.util.Time; import org.keycloak.events.Event; import org.keycloak.events.EventStoreProvider; @@ -26,6 +25,8 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.provider.ProviderFactory; +import org.junit.Test; + import static org.junit.Assert.assertEquals; @RequireProvider(EventStoreProvider.class) diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/authz/ConcurrentAuthzTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/authz/ConcurrentAuthzTest.java index 80ef58aa976..121d27ae990 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/authz/ConcurrentAuthzTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/authz/ConcurrentAuthzTest.java @@ -17,8 +17,12 @@ package org.keycloak.testsuite.model.authz; -import org.junit.Ignore; -import org.junit.Test; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; @@ -38,11 +42,8 @@ import org.keycloak.representations.idm.authorization.UserPolicyRepresentation; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.IntStream; +import org.junit.Ignore; +import org.junit.Test; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/client/ClientModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/client/ClientModelTest.java index 6c9b492256f..5cccdfd0815 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/client/ClientModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/client/ClientModelTest.java @@ -16,13 +16,9 @@ */ package org.keycloak.testsuite.model.client; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.notNullValue; +import java.util.Map; +import java.util.Set; -import org.junit.Test; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientProvider; import org.keycloak.models.Constants; @@ -31,11 +27,16 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.RealmProvider; import org.keycloak.models.RoleModel; import org.keycloak.models.RoleProvider; - import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; -import java.util.Map; -import java.util.Set; + +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.notNullValue; /** * diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/clientscope/ClientScopeModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/clientscope/ClientScopeModelTest.java index 8f29a39972f..1b705d159e0 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/clientscope/ClientScopeModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/clientscope/ClientScopeModelTest.java @@ -16,7 +16,10 @@ */ package org.keycloak.testsuite.model.clientscope; -import org.hamcrest.Matchers; +import java.util.LinkedList; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.models.ClientModel; import org.keycloak.models.ClientProvider; import org.keycloak.models.ClientScopeModel; @@ -29,10 +32,10 @@ import org.keycloak.models.RoleProvider; import org.keycloak.models.cache.CacheRealmProvider; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; -import java.util.LinkedList; -import java.util.List; -import java.util.stream.Collectors; + +import org.hamcrest.Matchers; import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.empty; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/clientscope/ClientScopeStorageTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/clientscope/ClientScopeStorageTest.java index ac4cfc1aef7..09cb84b1748 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/clientscope/ClientScopeStorageTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/clientscope/ClientScopeStorageTest.java @@ -16,10 +16,6 @@ */ package org.keycloak.testsuite.model.clientscope; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Test; import org.keycloak.component.ComponentModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.Constants; @@ -33,6 +29,11 @@ import org.keycloak.testsuite.federation.HardcodedClientScopeStorageProviderFact import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Test; + @RequireProvider(RealmProvider.class) @RequireProvider(ClientScopeStorageProvider.class) public class ClientScopeStorageTest extends KeycloakModelTest { diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/events/AdminEventQueryTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/events/AdminEventQueryTest.java index e9bc56ec169..9dc8ada2a9f 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/events/AdminEventQueryTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/events/AdminEventQueryTest.java @@ -16,13 +16,9 @@ */ package org.keycloak.testsuite.model.events; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.hasSize; -import static org.hamcrest.Matchers.is; +import java.util.List; +import java.util.stream.Collectors; -import org.apache.commons.lang3.RandomStringUtils; -import org.junit.Test; import org.keycloak.common.ClientConnection; import org.keycloak.events.EventStoreProvider; import org.keycloak.events.admin.AdminEvent; @@ -40,8 +36,13 @@ import org.keycloak.services.resources.admin.AdminEventBuilder; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; -import java.util.List; -import java.util.stream.Collectors; +import org.apache.commons.lang3.RandomStringUtils; +import org.junit.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.is; @RequireProvider(EventStoreProvider.class) public class AdminEventQueryTest extends KeycloakModelTest { diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/events/EventQueryTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/events/EventQueryTest.java index ece5d5659f8..d06483c7bff 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/events/EventQueryTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/events/EventQueryTest.java @@ -16,6 +16,10 @@ */ package org.keycloak.testsuite.model.events; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import org.keycloak.common.ClientConnection; import org.keycloak.events.Event; import org.keycloak.events.EventBuilder; @@ -26,11 +30,10 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; + import org.apache.commons.lang3.RandomStringUtils; import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/exportimport/ExportModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/exportimport/ExportModelTest.java index 4e46a967524..68ef3f8e6c6 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/exportimport/ExportModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/exportimport/ExportModelTest.java @@ -17,11 +17,12 @@ package org.keycloak.testsuite.model.exportimport; -import org.apache.commons.io.FileUtils; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TestName; +import java.io.Closeable; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + import org.keycloak.common.enums.SslRequired; import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.ExportImportManager; @@ -34,11 +35,11 @@ import org.keycloak.models.RoleModel; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; -import java.io.Closeable; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; +import org.apache.commons.io.FileUtils; +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TestName; @RequireProvider(value = ExportProvider.class) public class ExportModelTest extends KeycloakModelTest { diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/exportimport/ImportModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/exportimport/ImportModelTest.java index c9508ff9222..fc8cc8d38dd 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/exportimport/ImportModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/exportimport/ImportModelTest.java @@ -17,8 +17,9 @@ package org.keycloak.testsuite.model.exportimport; -import org.junit.Assert; -import org.junit.Test; +import java.nio.file.Path; +import java.nio.file.Paths; + import org.keycloak.exportimport.ExportImportConfig; import org.keycloak.exportimport.ExportImportManager; import org.keycloak.exportimport.ExportProvider; @@ -32,8 +33,8 @@ import org.keycloak.services.managers.ApplianceBootstrap; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; -import java.nio.file.Path; -import java.nio.file.Paths; +import org.junit.Assert; +import org.junit.Test; @RequireProvider(value = ImportProvider.class) public class ImportModelTest extends KeycloakModelTest { diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/group/GroupModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/group/GroupModelTest.java index 0bd32f8cc0e..a22660422fd 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/group/GroupModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/group/GroupModelTest.java @@ -17,7 +17,11 @@ package org.keycloak.testsuite.model.group; -import org.junit.Test; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + import org.keycloak.models.Constants; import org.keycloak.models.GroupModel; import org.keycloak.models.KeycloakSession; @@ -25,10 +29,7 @@ import org.keycloak.models.RealmModel; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.testsuite.model.KeycloakModelTest; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; +import org.junit.Test; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/CacheExpirationTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/CacheExpirationTest.java index eadc6b57e02..93592831ae8 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/CacheExpirationTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/CacheExpirationTest.java @@ -16,15 +16,6 @@ */ package org.keycloak.testsuite.model.infinispan; -import org.infinispan.Cache; -import org.junit.Assume; -import org.junit.Test; -import org.keycloak.connections.infinispan.InfinispanConnectionProvider; -import org.keycloak.infinispan.util.InfinispanUtils; -import org.keycloak.models.cache.infinispan.events.AuthenticationSessionAuthNoteUpdateEvent; -import org.keycloak.testsuite.model.KeycloakModelTest; -import org.keycloak.testsuite.model.RequireProvider; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -37,6 +28,16 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.keycloak.connections.infinispan.InfinispanConnectionProvider; +import org.keycloak.infinispan.util.InfinispanUtils; +import org.keycloak.models.cache.infinispan.events.AuthenticationSessionAuthNoteUpdateEvent; +import org.keycloak.testsuite.model.KeycloakModelTest; +import org.keycloak.testsuite.model.RequireProvider; + +import org.infinispan.Cache; +import org.junit.Assume; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.greaterThanOrEqualTo; import static org.hamcrest.Matchers.notNullValue; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/EmbeddedInfinispanSplitBrainTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/EmbeddedInfinispanSplitBrainTest.java index 89b54fe2536..e0acd4af83e 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/EmbeddedInfinispanSplitBrainTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/EmbeddedInfinispanSplitBrainTest.java @@ -1,19 +1,10 @@ package org.keycloak.testsuite.model.infinispan; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.WORK_CACHE_NAME; - import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.Assume; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.rules.TestRule; import org.keycloak.common.Profile; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.models.Constants; @@ -23,6 +14,17 @@ import org.keycloak.models.cache.CacheRealmProvider; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; +import org.junit.Assume; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.rules.TestRule; + +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.WORK_CACHE_NAME; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertTrue; + /** Tests to ensure that Keycloak correctly handles various split-brain scenarios when an Embedded Infinispan instance is used for clustering. diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/FeatureEnabledTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/FeatureEnabledTest.java index 9cdfcef62c2..5f7182f0ed9 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/FeatureEnabledTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/FeatureEnabledTest.java @@ -19,8 +19,6 @@ package org.keycloak.testsuite.model.infinispan; import java.util.Arrays; -import org.infinispan.commons.CacheConfigurationException; -import org.junit.Test; import org.keycloak.common.Profile; import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; @@ -28,14 +26,18 @@ import org.keycloak.infinispan.util.InfinispanUtils; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; +import org.infinispan.commons.CacheConfigurationException; +import org.junit.Test; + +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLUSTERED_CACHE_NAMES; +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.LOCAL_CACHE_NAMES; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import static org.junit.Assume.assumeFalse; import static org.junit.Assume.assumeTrue; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLUSTERED_CACHE_NAMES; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.LOCAL_CACHE_NAMES; /** * Checks if the correct embedded or remote cache is started based on {@link org.keycloak.common.Profile.Feature}. diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/InfinispanIckleQueryTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/InfinispanIckleQueryTest.java index c004b246664..21995cebada 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/InfinispanIckleQueryTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/InfinispanIckleQueryTest.java @@ -29,14 +29,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; -import org.infinispan.client.hotrod.RemoteCache; -import org.infinispan.commons.api.query.Query; -import org.infinispan.commons.util.concurrent.CompletionStages; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.rules.TestRule; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.infinispan.util.InfinispanUtils; import org.keycloak.models.KeycloakSession; @@ -60,6 +52,15 @@ import org.keycloak.models.sessions.infinispan.remote.RemoteUserLoginFailureProv import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; +import org.infinispan.client.hotrod.RemoteCache; +import org.infinispan.commons.api.query.Query; +import org.infinispan.commons.util.concurrent.CompletionStages; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.rules.TestRule; + @RequireProvider(UserLoginFailureProvider.class) @RequireProvider(UserSessionProvider.class) @RequireProvider(UserProvider.class) diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/PartitionManager.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/PartitionManager.java index a9483eb762d..0cc82672efb 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/PartitionManager.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/PartitionManager.java @@ -1,8 +1,5 @@ package org.keycloak.testsuite.model.infinispan; -import static org.infinispan.test.TestingUtil.blockUntilViewsReceived; -import static org.infinispan.test.TestingUtil.waitForNoRebalance; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -29,6 +26,9 @@ import org.jgroups.stack.Protocol; import org.jgroups.stack.ProtocolStack; import org.jgroups.util.MutableDigest; +import static org.infinispan.test.TestingUtil.blockUntilViewsReceived; +import static org.infinispan.test.TestingUtil.waitForNoRebalance; + public class PartitionManager { private static final Logger log = Logger.getLogger(PartitionManager.class); diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/RetryAndBackOffTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/RetryAndBackOffTest.java index 0cd98afd036..b93d75d90cf 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/RetryAndBackOffTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/infinispan/RetryAndBackOffTest.java @@ -20,11 +20,6 @@ package org.keycloak.testsuite.model.infinispan; import java.util.concurrent.CompletionException; import java.util.concurrent.ThreadLocalRandom; -import org.infinispan.client.hotrod.exceptions.HotRodClientException; -import org.junit.Assume; -import org.junit.ClassRule; -import org.junit.Test; -import org.junit.rules.TestRule; import org.keycloak.infinispan.util.InfinispanUtils; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; @@ -38,9 +33,16 @@ import org.keycloak.testsuite.model.HotRodServerRule; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; +import org.infinispan.client.hotrod.exceptions.HotRodClientException; +import org.junit.Assume; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.rules.TestRule; + +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.LOGIN_FAILURE_CACHE_NAME; + import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.LOGIN_FAILURE_CACHE_NAME; @RequireProvider(UserLoginFailureProvider.class) @RequireProvider(UserProvider.class) diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/loginfailure/RemoteLoginFailureTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/loginfailure/RemoteLoginFailureTest.java index 413c864b493..25161722a31 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/loginfailure/RemoteLoginFailureTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/loginfailure/RemoteLoginFailureTest.java @@ -20,10 +20,6 @@ package org.keycloak.testsuite.model.loginfailure; import java.util.List; import java.util.stream.IntStream; -import org.infinispan.client.hotrod.RemoteCache; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Test; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.infinispan.util.InfinispanUtils; import org.keycloak.models.Constants; @@ -37,6 +33,11 @@ import org.keycloak.models.sessions.infinispan.entities.LoginFailureKey; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; +import org.infinispan.client.hotrod.RemoteCache; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Test; + @RequireProvider(UserLoginFailureProvider.class) @RequireProvider(UserProvider.class) @RequireProvider(RealmProvider.class) diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/BackwardsCompatibilityUserStorage.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/BackwardsCompatibilityUserStorage.java index 1a66196f0f9..2f1f876ab63 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/BackwardsCompatibilityUserStorage.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/BackwardsCompatibilityUserStorage.java @@ -16,16 +16,18 @@ */ package org.keycloak.testsuite.model.parameters; -import org.keycloak.testsuite.model.KeycloakModelParameters; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Stream; + import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.testsuite.federation.BackwardsCompatibilityUserStorageFactory; +import org.keycloak.testsuite.model.KeycloakModelParameters; + import com.google.common.collect.ImmutableSet; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Stream; /** * diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HardcodedClientStorage.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HardcodedClientStorage.java index 6310796be15..c30dd7d99c3 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HardcodedClientStorage.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/HardcodedClientStorage.java @@ -16,7 +16,10 @@ */ package org.keycloak.testsuite.model.parameters; -import com.google.common.collect.ImmutableSet; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Stream; + import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; import org.keycloak.storage.client.ClientStorageProviderModel; @@ -25,9 +28,7 @@ import org.keycloak.testsuite.federation.HardcodedClientStorageProviderFactory; import org.keycloak.testsuite.model.Config; import org.keycloak.testsuite.model.KeycloakModelParameters; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Stream; +import com.google.common.collect.ImmutableSet; public class HardcodedClientStorage extends KeycloakModelParameters { static final Set> ALLOWED_SPIS = ImmutableSet.>builder() diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/Infinispan.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/Infinispan.java index cf70c8d9efb..5bf44358c57 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/Infinispan.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/Infinispan.java @@ -19,7 +19,6 @@ package org.keycloak.testsuite.model.parameters; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import com.google.common.collect.ImmutableSet; import org.keycloak.cluster.infinispan.InfinispanClusterProviderFactory; import org.keycloak.connections.infinispan.InfinispanConnectionProviderFactory; import org.keycloak.connections.infinispan.InfinispanConnectionSpi; @@ -61,6 +60,8 @@ import org.keycloak.testsuite.model.Config; import org.keycloak.testsuite.model.KeycloakModelParameters; import org.keycloak.timer.TimerProviderFactory; +import com.google.common.collect.ImmutableSet; + /** * @author hmlnarik */ diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/Jpa.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/Jpa.java index 0044d8cd6cf..85852e06032 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/Jpa.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/Jpa.java @@ -18,7 +18,6 @@ package org.keycloak.testsuite.model.parameters; import java.util.Set; -import com.google.common.collect.ImmutableSet; import org.keycloak.authorization.jpa.store.JPAAuthorizationStoreFactory; import org.keycloak.broker.provider.IdentityProviderFactory; import org.keycloak.broker.provider.IdentityProviderSpi; @@ -56,6 +55,8 @@ import org.keycloak.storage.datastore.DefaultDatastoreProviderFactory; import org.keycloak.testsuite.model.Config; import org.keycloak.testsuite.model.KeycloakModelParameters; +import com.google.common.collect.ImmutableSet; + /** * * @author hmlnarik diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaFederation.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaFederation.java index 29ba4088afc..29a0e1921bb 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaFederation.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/JpaFederation.java @@ -16,22 +16,24 @@ */ package org.keycloak.testsuite.model.parameters; -import org.keycloak.testsuite.model.KeycloakModelParameters; -import org.keycloak.provider.ProviderFactory; -import org.keycloak.provider.Spi; -import org.keycloak.storage.UserStorageProviderSpi; -import org.keycloak.storage.federated.UserFederatedStorageProviderSpi; -import org.keycloak.storage.jpa.JpaUserFederatedStorageProviderFactory; -import com.google.common.collect.ImmutableSet; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; + +import org.keycloak.provider.ProviderFactory; +import org.keycloak.provider.Spi; +import org.keycloak.storage.UserStorageProviderSpi; import org.keycloak.storage.clientscope.ClientScopeStorageProvider; import org.keycloak.storage.clientscope.ClientScopeStorageProviderFactory; import org.keycloak.storage.clientscope.ClientScopeStorageProviderModel; import org.keycloak.storage.clientscope.ClientScopeStorageProviderSpi; +import org.keycloak.storage.federated.UserFederatedStorageProviderSpi; +import org.keycloak.storage.jpa.JpaUserFederatedStorageProviderFactory; import org.keycloak.testsuite.federation.HardcodedClientScopeStorageProviderFactory; import org.keycloak.testsuite.model.Config; +import org.keycloak.testsuite.model.KeycloakModelParameters; + +import com.google.common.collect.ImmutableSet; /** * diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/LdapUserStorage.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/LdapUserStorage.java index 06a96aee4cd..9babdd41de1 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/LdapUserStorage.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/LdapUserStorage.java @@ -16,8 +16,11 @@ */ package org.keycloak.testsuite.model.parameters; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Stream; + import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.testsuite.model.KeycloakModelParameters; import org.keycloak.models.LDAPConstants; import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; @@ -28,12 +31,11 @@ import org.keycloak.storage.federated.UserFederatedStorageProviderSpi; import org.keycloak.storage.ldap.LDAPStorageProviderFactory; import org.keycloak.storage.ldap.mappers.LDAPStorageMapperFactory; import org.keycloak.storage.ldap.mappers.LDAPStorageMapperSpi; +import org.keycloak.testsuite.model.KeycloakModelParameters; import org.keycloak.testsuite.util.LDAPRule; import org.keycloak.util.ldap.LDAPEmbeddedServer; + import com.google.common.collect.ImmutableSet; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Stream; import org.junit.runner.Description; import org.junit.runners.model.Statement; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/RemoteInfinispan.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/RemoteInfinispan.java index 376563ff9eb..14c59e6011d 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/RemoteInfinispan.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/RemoteInfinispan.java @@ -20,9 +20,6 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; -import com.google.common.collect.ImmutableSet; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; import org.keycloak.cluster.infinispan.remote.RemoteInfinispanClusterProviderFactory; import org.keycloak.connections.infinispan.remote.RemoteLoadBalancerCheckProviderFactory; import org.keycloak.models.sessions.infinispan.remote.RemoteInfinispanAuthenticationSessionProviderFactory; @@ -39,6 +36,10 @@ import org.keycloak.testsuite.model.Config; import org.keycloak.testsuite.model.HotRodServerRule; import org.keycloak.testsuite.model.KeycloakModelParameters; +import com.google.common.collect.ImmutableSet; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + /** * Enables RemoteInfinispan and adds all classes needed to connect to remote Infinispan to allowed factories */ diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/TestsuiteUserFileStorage.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/TestsuiteUserFileStorage.java index 6a5f0410b52..925ba1fb45d 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/TestsuiteUserFileStorage.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/TestsuiteUserFileStorage.java @@ -16,7 +16,11 @@ */ package org.keycloak.testsuite.model.parameters; -import com.google.common.collect.ImmutableSet; +import java.io.File; +import java.net.URISyntaxException; +import java.util.Set; +import java.util.stream.Stream; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; @@ -25,10 +29,7 @@ import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.testsuite.federation.UserPropertyFileStorageFactory; import org.keycloak.testsuite.model.KeycloakModelParameters; -import java.io.File; -import java.net.URISyntaxException; -import java.util.Set; -import java.util.stream.Stream; +import com.google.common.collect.ImmutableSet; /** * diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/TestsuiteUserMapStorage.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/TestsuiteUserMapStorage.java index c9a35945e57..fa435ecad3c 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/TestsuiteUserMapStorage.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/TestsuiteUserMapStorage.java @@ -16,16 +16,18 @@ */ package org.keycloak.testsuite.model.parameters; -import org.keycloak.testsuite.model.KeycloakModelParameters; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Stream; + import org.keycloak.provider.ProviderFactory; import org.keycloak.provider.Spi; import org.keycloak.storage.UserStorageProvider; import org.keycloak.storage.UserStorageProviderModel; import org.keycloak.testsuite.federation.UserMapStorageFactory; +import org.keycloak.testsuite.model.KeycloakModelParameters; + import com.google.common.collect.ImmutableSet; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Stream; /** * diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/VolatileUserSessions.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/VolatileUserSessions.java index b3901513fbe..7bd03ef26c6 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/VolatileUserSessions.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/parameters/VolatileUserSessions.java @@ -16,13 +16,13 @@ */ package org.keycloak.testsuite.model.parameters; +import java.util.Collections; + import org.keycloak.common.Profile; import org.keycloak.common.profile.PropertiesProfileConfigResolver; import org.keycloak.testsuite.model.Config; import org.keycloak.testsuite.model.KeycloakModelParameters; -import java.util.Collections; - public class VolatileUserSessions extends KeycloakModelParameters { public VolatileUserSessions() { diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/role/RoleModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/role/RoleModelTest.java index 3f2a2c8fa39..0832b1f439b 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/role/RoleModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/role/RoleModelTest.java @@ -1,7 +1,14 @@ package org.keycloak.testsuite.model.role; -import org.hamcrest.Matcher; -import org.junit.Test; +import java.util.Collection; +import java.util.List; +import java.util.Random; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + import org.keycloak.models.ClientModel; import org.keycloak.models.ClientProvider; import org.keycloak.models.Constants; @@ -13,16 +20,10 @@ import org.keycloak.models.RoleProvider; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; -import java.util.Collection; -import java.util.List; -import java.util.Random; -import java.util.UUID; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import java.util.stream.Stream; - +import org.hamcrest.Matcher; import org.junit.Assume; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsInAnyOrder; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/AuthenticationSessionTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/AuthenticationSessionTest.java index 87bb68a6ae5..1e6497d1197 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/AuthenticationSessionTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/AuthenticationSessionTest.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.model.session; -import org.hamcrest.Matchers; -import org.infinispan.Cache; -import org.infinispan.factories.ComponentRegistry; -import org.infinispan.interceptors.AsyncInterceptorChain; -import org.infinispan.interceptors.impl.CacheMgmtInterceptor; -import org.junit.Assert; -import org.junit.Test; +import java.util.List; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.LongSupplier; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; @@ -36,16 +37,17 @@ import org.keycloak.testsuite.model.HotRodServerRule; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.LongSupplier; -import java.util.stream.Collectors; -import java.util.stream.IntStream; +import org.hamcrest.Matchers; +import org.infinispan.Cache; +import org.infinispan.factories.ComponentRegistry; +import org.infinispan.interceptors.AsyncInterceptorChain; +import org.infinispan.interceptors.impl.CacheMgmtInterceptor; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.testsuite.model.session.UserSessionPersisterProviderTest.createClients; import static org.hamcrest.MatcherAssert.assertThat; -import static org.keycloak.testsuite.model.session.UserSessionPersisterProviderTest.createClients; /** * @author Martin Kanis diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/OfflineSessionPersistenceTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/OfflineSessionPersistenceTest.java index 123e92a3a8e..e74add134a4 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/OfflineSessionPersistenceTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/OfflineSessionPersistenceTest.java @@ -34,9 +34,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import java.util.stream.Stream; -import org.hamcrest.Matchers; -import org.infinispan.commons.CacheException; -import org.junit.Test; import org.keycloak.infinispan.util.InfinispanUtils; import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; @@ -55,6 +52,10 @@ import org.keycloak.services.managers.RealmManager; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; +import org.hamcrest.Matchers; +import org.infinispan.commons.CacheException; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assume.assumeTrue; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/SessionTimeoutsTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/SessionTimeoutsTest.java index 37c53aea07d..1a02c860417 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/SessionTimeoutsTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/SessionTimeoutsTest.java @@ -19,13 +19,6 @@ package org.keycloak.testsuite.model.session; import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.ClassRule; -import org.junit.FixMethodOrder; -import org.junit.Test; -import org.junit.rules.TestRule; -import org.junit.runners.MethodSorters; import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.common.util.Retry; import org.keycloak.common.util.Time; @@ -50,6 +43,14 @@ import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; import org.keycloak.testsuite.model.infinispan.InfinispanTestUtil; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.ClassRule; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.rules.TestRule; +import org.junit.runners.MethodSorters; + /** *

* Test that checks the Infinispan user session provider expires the sessions diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionConcurrencyTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionConcurrencyTest.java index 97f8d883943..72f65b59b8f 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionConcurrencyTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionConcurrencyTest.java @@ -17,7 +17,10 @@ package org.keycloak.testsuite.model.session; -import org.junit.Test; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.stream.IntStream; + import org.keycloak.models.AuthenticatedClientSessionModel; import org.keycloak.models.ClientModel; import org.keycloak.models.Constants; @@ -29,9 +32,7 @@ import org.keycloak.protocol.oidc.OIDCLoginProtocol; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.stream.IntStream; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.aMapWithSize; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionExpirationTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionExpirationTest.java index c21c4d846ce..09916f9786b 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionExpirationTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionExpirationTest.java @@ -22,10 +22,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.awaitility.Awaitility; -import org.infinispan.Cache; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.common.util.Time; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.events.Details; @@ -46,6 +42,11 @@ import org.keycloak.testsuite.model.HotRodServerRule; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; +import org.awaitility.Awaitility; +import org.infinispan.Cache; +import org.junit.Assert; +import org.junit.Test; + import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.OFFLINE_USER_SESSION_CACHE_NAME; import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.USER_SESSION_CACHE_NAME; import static org.keycloak.models.utils.SessionTimeoutHelper.PERIODIC_CLEANER_IDLE_TIMEOUT_WINDOW_SECONDS; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionInitializerTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionInitializerTest.java index b2bde741162..b6048436c66 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionInitializerTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionInitializerTest.java @@ -24,10 +24,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import org.infinispan.Cache; -import org.infinispan.client.hotrod.RemoteCache; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.infinispan.util.InfinispanUtils; @@ -46,11 +42,17 @@ import org.keycloak.testsuite.model.HotRodServerRule; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; +import org.infinispan.Cache; +import org.infinispan.client.hotrod.RemoteCache; +import org.junit.Assert; +import org.junit.Test; + +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.USER_SESSION_CACHE_NAME; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Every.everyItem; import static org.hamcrest.core.Is.is; import static org.junit.Assume.assumeFalse; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.USER_SESSION_CACHE_NAME; /** * @author Marek Posolda @@ -238,4 +240,3 @@ public class UserSessionInitializerTest extends KeycloakModelTest { Assert.fail("Session with ID " + id + " not found in the list"); } } - diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionPersisterProviderTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionPersisterProviderTest.java index 2682add061e..c7249caaf71 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionPersisterProviderTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionPersisterProviderTest.java @@ -35,11 +35,6 @@ import java.util.function.Function; import java.util.stream.IntStream; import java.util.stream.Stream; -import org.hamcrest.Matchers; -import org.infinispan.Cache; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Test; import org.keycloak.OAuth2Constants; import org.keycloak.common.Profile; import org.keycloak.common.util.MultiSiteUtils; @@ -78,12 +73,19 @@ import org.keycloak.testsuite.federation.HardcodedClientStorageProviderFactory; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; +import org.hamcrest.Matchers; +import org.infinispan.Cache; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Test; + +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; +import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.USER_SESSION_CACHE_NAME; + import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.CLIENT_SESSION_CACHE_NAME; -import static org.keycloak.connections.infinispan.InfinispanConnectionProvider.USER_SESSION_CACHE_NAME; /** * @author Marek Posolda diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderModelTest.java index 50ab90f4d39..65300431182 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderModelTest.java @@ -25,10 +25,6 @@ import java.util.concurrent.CyclicBarrier; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Test; import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.infinispan.util.InfinispanUtils; import org.keycloak.models.AuthenticatedClientSessionModel; @@ -49,14 +45,20 @@ import org.keycloak.testsuite.model.RequireProvider; import org.keycloak.testsuite.model.infinispan.InfinispanTestUtil; import org.keycloak.timer.TimerProvider; +import org.hamcrest.Matchers; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Test; + +import static org.keycloak.testsuite.model.session.UserSessionPersisterProviderTest.createClients; +import static org.keycloak.testsuite.model.session.UserSessionPersisterProviderTest.createSessions; + import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import static org.keycloak.testsuite.model.session.UserSessionPersisterProviderTest.createClients; -import static org.keycloak.testsuite.model.session.UserSessionPersisterProviderTest.createSessions; /** * @author Martin Kanis diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderOfflineModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderOfflineModelTest.java index 45ce60c97ad..6c264f9f1a4 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderOfflineModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/session/UserSessionProviderOfflineModelTest.java @@ -32,13 +32,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.hamcrest.Matchers; -import org.infinispan.AdvancedCache; -import org.infinispan.Cache; -import org.infinispan.context.Flag; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Test; import org.keycloak.common.Profile; import org.keycloak.common.util.MultiSiteUtils; import org.keycloak.common.util.Time; @@ -64,6 +57,14 @@ import org.keycloak.testsuite.model.RequireProvider; import org.keycloak.testsuite.model.infinispan.InfinispanTestUtil; import org.keycloak.timer.TimerProvider; +import org.hamcrest.Matchers; +import org.infinispan.AdvancedCache; +import org.infinispan.Cache; +import org.infinispan.context.Flag; +import org.junit.Assert; +import org.junit.Assume; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assume.assumeFalse; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/singleUseObject/SingleUseObjectModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/singleUseObject/SingleUseObjectModelTest.java index 53f57d0ef0c..592137c5adb 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/singleUseObject/SingleUseObjectModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/singleUseObject/SingleUseObjectModelTest.java @@ -25,10 +25,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import org.hamcrest.Matchers; -import org.infinispan.client.hotrod.RemoteCache; -import org.junit.Assert; -import org.junit.Test; import org.keycloak.common.util.Time; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.infinispan.util.InfinispanUtils; @@ -44,6 +40,11 @@ import org.keycloak.services.scheduled.ClearExpiredRevokedTokens; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; +import org.hamcrest.Matchers; +import org.infinispan.client.hotrod.RemoteCache; +import org.junit.Assert; +import org.junit.Test; + import static org.hamcrest.MatcherAssert.assertThat; @RequireProvider(SingleUseObjectProvider.class) diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/transaction/StorageTransactionTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/transaction/StorageTransactionTest.java index 6a3be9c84ca..4d3e93cb7dc 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/transaction/StorageTransactionTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/transaction/StorageTransactionTest.java @@ -17,7 +17,6 @@ package org.keycloak.testsuite.model.transaction; -import org.junit.Test; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -26,6 +25,8 @@ import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; import org.keycloak.testsuite.model.util.TransactionController; +import org.junit.Test; + import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/FederatedUserTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/FederatedUserTest.java index 629cee895f7..41f12d2720a 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/FederatedUserTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/FederatedUserTest.java @@ -17,7 +17,9 @@ package org.keycloak.testsuite.model.user; -import org.junit.Test; +import java.util.function.BiFunction; +import java.util.function.Consumer; + import org.keycloak.cluster.ClusterProvider; import org.keycloak.component.ComponentModel; import org.keycloak.models.Constants; @@ -40,15 +42,15 @@ import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; import org.keycloak.testsuite.util.LDAPTestUtils; -import java.util.function.BiFunction; -import java.util.function.Consumer; +import org.junit.Test; + +import static org.keycloak.models.LDAPConstants.LDAP_ID; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assume.assumeThat; -import static org.keycloak.models.LDAPConstants.LDAP_ID; @RequireProvider(UserProvider.class) @RequireProvider(ClusterProvider.class) @@ -217,4 +219,3 @@ public class FederatedUserTest extends KeycloakModelTest { }); } } - diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserModelTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserModelTest.java index 2e770813357..7b873e89a56 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserModelTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserModelTest.java @@ -16,8 +16,15 @@ */ package org.keycloak.testsuite.model.user; -import org.hamcrest.Matchers; -import org.junit.Test; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.ConcurrentSkipListSet; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import java.util.stream.IntStream; + import org.keycloak.component.ComponentModel; import org.keycloak.models.Constants; import org.keycloak.models.GroupModel; @@ -34,14 +41,8 @@ import org.keycloak.storage.user.UserRegistrationProvider; import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.concurrent.ConcurrentSkipListSet; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.Collectors; -import java.util.stream.IntStream; +import org.hamcrest.Matchers; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItem; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserPaginationTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserPaginationTest.java index 27a9cf271d5..49f736bf6de 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserPaginationTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserPaginationTest.java @@ -1,7 +1,11 @@ package org.keycloak.testsuite.model.user; -import org.hamcrest.Matchers; -import org.junit.Test; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + import org.keycloak.component.ComponentModel; import org.keycloak.models.Constants; import org.keycloak.models.KeycloakSession; @@ -15,13 +19,10 @@ import org.keycloak.testsuite.federation.UserPropertyFileStorage; import org.keycloak.testsuite.federation.UserPropertyFileStorage.UserPropertyFileStorageCall; import org.keycloak.testsuite.federation.UserPropertyFileStorageFactory; import org.keycloak.testsuite.model.KeycloakModelTest; - import org.keycloak.testsuite.model.RequireProvider; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; + +import org.hamcrest.Matchers; +import org.junit.Test; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserSyncTest.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserSyncTest.java index 661e33e74fe..af83f79336f 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserSyncTest.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/user/UserSyncTest.java @@ -17,8 +17,11 @@ package org.keycloak.testsuite.model.user; -import org.hamcrest.Matchers; -import org.junit.Test; +import java.util.Collections; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.IntStream; +import javax.naming.directory.BasicAttribute; + import org.keycloak.cluster.ClusterProvider; import org.keycloak.component.ComponentModel; import org.keycloak.models.Constants; @@ -48,10 +51,11 @@ import org.keycloak.testsuite.model.KeycloakModelTest; import org.keycloak.testsuite.model.RequireProvider; import org.keycloak.testsuite.util.LDAPTestUtils; -import javax.naming.directory.BasicAttribute; -import java.util.Collections; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.IntStream; +import org.hamcrest.Matchers; +import org.junit.Test; + +import static org.keycloak.models.LDAPConstants.LDAP_ID; +import static org.keycloak.storage.UserStorageProviderModel.REMOVE_INVALID_USERS_ENABLED; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; @@ -60,8 +64,6 @@ import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assume.assumeThat; -import static org.keycloak.models.LDAPConstants.LDAP_ID; -import static org.keycloak.storage.UserStorageProviderModel.REMOVE_INVALID_USERS_ENABLED; @RequireProvider(UserProvider.class) @RequireProvider(ClusterProvider.class) @@ -398,4 +400,3 @@ public class UserSyncTest extends KeycloakModelTest { }); } } - diff --git a/testsuite/model/src/test/java/org/keycloak/testsuite/model/util/TransactionController.java b/testsuite/model/src/test/java/org/keycloak/testsuite/model/util/TransactionController.java index a59e4336c92..9e26102b714 100644 --- a/testsuite/model/src/test/java/org/keycloak/testsuite/model/util/TransactionController.java +++ b/testsuite/model/src/test/java/org/keycloak/testsuite/model/util/TransactionController.java @@ -17,10 +17,6 @@ package org.keycloak.testsuite.model.util; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.models.KeycloakTransactionManager; - import java.util.Objects; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -29,6 +25,10 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.models.KeycloakTransactionManager; + /** * This controller adds possibility to manually control more transaction within * one test case. diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/JsonConfigProviderFactory.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/JsonConfigProviderFactory.java index bf0723c34f9..e3dc8fd94e5 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/JsonConfigProviderFactory.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/JsonConfigProviderFactory.java @@ -17,18 +17,20 @@ package org.keycloak.testsuite; -import org.keycloak.config.ConfigProviderFactory; -import com.fasterxml.jackson.databind.JsonNode; import java.io.File; import java.io.IOException; import java.net.URL; import java.util.Optional; -import org.jboss.logging.Logger; + import org.keycloak.Config; +import org.keycloak.config.ConfigProviderFactory; import org.keycloak.services.ServicesLogger; import org.keycloak.util.JsonSerialization; import org.keycloak.utils.JsonConfigProvider; +import com.fasterxml.jackson.databind.JsonNode; +import org.jboss.logging.Logger; + public class JsonConfigProviderFactory implements ConfigProviderFactory { private static final Logger LOG = Logger.getLogger(JsonConfigProviderFactory.class); diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/KerberosEmbeddedServer.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/KerberosEmbeddedServer.java index c412375ccb0..21d4c96bf45 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/KerberosEmbeddedServer.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/KerberosEmbeddedServer.java @@ -17,6 +17,19 @@ package org.keycloak.testsuite; +import java.io.IOException; +import java.lang.reflect.Field; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Locale; +import java.util.Properties; +import java.util.Set; +import javax.security.auth.kerberos.KerberosPrincipal; + +import org.keycloak.util.ldap.LDAPEmbeddedServer; + import org.apache.directory.api.ldap.model.constants.SupportedSaslMechanisms; import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.server.core.api.DirectoryService; @@ -35,18 +48,6 @@ import org.apache.directory.shared.kerberos.KerberosTime; import org.apache.directory.shared.kerberos.KerberosUtils; import org.apache.directory.shared.kerberos.codec.types.EncryptionType; import org.jboss.logging.Logger; -import org.keycloak.util.ldap.LDAPEmbeddedServer; - -import javax.security.auth.kerberos.KerberosPrincipal; -import java.io.IOException; -import java.lang.reflect.Field; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Locale; -import java.util.Properties; -import java.util.Set; /** * @author Marek Posolda diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java index 263cd14b3b9..7b777a80a8d 100755 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/KeycloakServer.java @@ -16,17 +16,33 @@ */ package org.keycloak.testsuite; -import io.undertow.Undertow; -import io.undertow.Undertow.Builder; -import io.undertow.servlet.Servlets; -import io.undertow.servlet.api.DefaultServletConfig; -import io.undertow.servlet.api.DeploymentInfo; -import io.undertow.servlet.api.FilterInfo; -import org.jboss.logging.Logger; -import org.jboss.resteasy.core.ResteasyDeploymentImpl; -import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters; -import org.jboss.resteasy.plugins.server.undertow.UndertowJaxrsServer; -import org.jboss.resteasy.spi.ResteasyDeployment; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.security.KeyStore; +import java.text.SimpleDateFormat; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.function.Function; +import java.util.stream.Stream; +import javax.net.ssl.KeyManager; +import javax.net.ssl.KeyManagerFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; +import javax.net.ssl.TrustManagerFactory; + +import jakarta.servlet.DispatcherType; +import jakarta.servlet.Filter; + import org.keycloak.authentication.AuthenticatorSpi; import org.keycloak.authentication.authenticators.browser.DeployedScriptAuthenticatorFactory; import org.keycloak.authorization.policy.provider.PolicySpi; @@ -55,36 +71,22 @@ import org.keycloak.services.resources.KeycloakApplication; import org.keycloak.services.resteasy.ResteasyKeycloakApplication; import org.keycloak.testsuite.util.cli.TestsuiteCLI; import org.keycloak.util.JsonSerialization; + +import io.undertow.Undertow; +import io.undertow.Undertow.Builder; +import io.undertow.servlet.Servlets; +import io.undertow.servlet.api.DefaultServletConfig; +import io.undertow.servlet.api.DeploymentInfo; +import io.undertow.servlet.api.FilterInfo; import io.undertow.servlet.api.InstanceHandle; +import org.jboss.logging.Logger; +import org.jboss.resteasy.core.ResteasyDeploymentImpl; +import org.jboss.resteasy.plugins.server.servlet.ResteasyContextParameters; +import org.jboss.resteasy.plugins.server.undertow.UndertowJaxrsServer; +import org.jboss.resteasy.spi.ResteasyDeployment; import org.xnio.Options; import org.xnio.SslClientAuthMode; -import javax.net.ssl.KeyManager; -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactory; -import jakarta.servlet.DispatcherType; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.security.KeyStore; -import java.text.SimpleDateFormat; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.function.Function; -import java.util.stream.Stream; -import jakarta.servlet.Filter; - /** * @author Stian Thorgersen */ diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java index 73cdd625015..d032fb27b31 100755 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/MailServer.java @@ -17,13 +17,13 @@ package org.keycloak.testsuite; -import com.icegreen.greenmail.util.GreenMail; -import com.icegreen.greenmail.util.ServerSetup; - import jakarta.mail.internet.MimeMessage; import jakarta.mail.internet.MimeMessage.RecipientType; import jakarta.mail.internet.MimeMultipart; +import com.icegreen.greenmail.util.GreenMail; +import com.icegreen.greenmail.util.ServerSetup; + public class MailServer { public static void main(String[] args) throws Exception { diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/TestPlatform.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/TestPlatform.java index b2ae0e8df93..d9ac53f93ff 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/TestPlatform.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/TestPlatform.java @@ -21,11 +21,12 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; -import org.jboss.logging.Logger; import org.keycloak.common.Profile; import org.keycloak.common.profile.PropertiesProfileConfigResolver; import org.keycloak.platform.PlatformProvider; +import org.jboss.logging.Logger; + public class TestPlatform implements PlatformProvider { private static final Logger log = Logger.getLogger(TestPlatform.class); diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/TotpGenerator.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/TotpGenerator.java index 1ef1702e3ca..c72dbdf499f 100755 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/TotpGenerator.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/TotpGenerator.java @@ -17,9 +17,6 @@ package org.keycloak.testsuite; -import org.keycloak.models.utils.Base32; -import org.keycloak.models.utils.TimeBasedOTP; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -27,6 +24,9 @@ import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.TimeUnit; +import org.keycloak.models.utils.Base32; +import org.keycloak.models.utils.TimeBasedOTP; + public class TotpGenerator { diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/UndertowRequestFilter.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/UndertowRequestFilter.java index f394c7d0786..155b216b1a4 100755 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/UndertowRequestFilter.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/UndertowRequestFilter.java @@ -26,12 +26,13 @@ import jakarta.servlet.ServletRequest; import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletRequest; -import org.jboss.resteasy.core.ResteasyContext; import org.keycloak.common.ClientConnection; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.utils.KeycloakModelUtils; +import org.jboss.resteasy.core.ResteasyContext; + public class UndertowRequestFilter implements Filter { private final KeycloakSessionFactory factory; diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractCommand.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractCommand.java index e3b0158aed3..b05a254771b 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractCommand.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractCommand.java @@ -17,13 +17,14 @@ package org.keycloak.testsuite.util.cli; -import org.jboss.logging.Logger; +import java.util.List; + import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; import org.keycloak.models.KeycloakSessionTask; import org.keycloak.models.utils.KeycloakModelUtils; -import java.util.List; +import org.jboss.logging.Logger; /** * @author Marek Posolda diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java index 2342d39568b..0ab6debef0d 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/AbstractSessionCacheCommand.java @@ -17,9 +17,10 @@ package org.keycloak.testsuite.util.cli; -import org.infinispan.AdvancedCache; -import org.infinispan.Cache; -import org.infinispan.context.Flag; +import java.util.Arrays; +import java.util.Set; +import java.util.TreeSet; + import org.keycloak.common.util.Time; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.models.ClientModel; @@ -33,9 +34,9 @@ import org.keycloak.models.sessions.infinispan.entities.UserSessionEntity; import org.keycloak.models.utils.KeycloakModelUtils; import org.keycloak.services.managers.UserSessionManager; -import java.util.Arrays; -import java.util.Set; -import java.util.TreeSet; +import org.infinispan.AdvancedCache; +import org.infinispan.Cache; +import org.infinispan.context.Flag; /** * @author Marek Posolda diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/CacheCommands.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/CacheCommands.java index 1f2e10db496..a50a212e978 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/CacheCommands.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/CacheCommands.java @@ -20,11 +20,12 @@ package org.keycloak.testsuite.util.cli; import java.util.Map; import java.util.Set; -import org.infinispan.Cache; import org.keycloak.connections.infinispan.InfinispanConnectionProvider; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; +import org.infinispan.Cache; + /** * @author Marek Posolda */ diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java index 1b29be61407..fa7c5dd6174 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/ClusterProviderTaskCommand.java @@ -17,14 +17,14 @@ package org.keycloak.testsuite.util.cli; -import org.keycloak.cluster.ClusterProvider; -import org.keycloak.common.util.MultivaluedHashMap; -import org.keycloak.models.KeycloakSession; - import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import org.keycloak.cluster.ClusterProvider; +import org.keycloak.common.util.MultivaluedHashMap; +import org.keycloak.models.KeycloakSession; + /** * @author Marek Posolda */ diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java index 8de38c9b87b..e61107b1f09 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/SyncDummyFederationProviderCommand.java @@ -17,14 +17,14 @@ package org.keycloak.testsuite.util.cli; +import java.util.Objects; + import org.keycloak.common.util.MultivaluedHashMap; import org.keycloak.models.KeycloakSession; -import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.models.RealmModel; -import org.keycloak.storage.managers.UserStorageSyncManager; +import org.keycloak.models.StorageProviderRealmModel; import org.keycloak.storage.UserStorageProviderModel; - -import java.util.Objects; +import org.keycloak.storage.managers.UserStorageSyncManager; /** * @author Marek Posolda diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java index 6e10827cd5d..6961033ca4b 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestCacheUtils.java @@ -17,6 +17,8 @@ package org.keycloak.testsuite.util.cli; +import java.util.Collections; + import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.GroupModel; @@ -24,8 +26,6 @@ import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.RoleContainerModel; -import java.util.Collections; - /** * @author Marek Posolda */ diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java index c4811850d8f..e7375b6d1be 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/TestsuiteCLI.java @@ -17,11 +17,6 @@ package org.keycloak.testsuite.util.cli; -import org.jboss.logging.Logger; -import org.keycloak.models.KeycloakSession; -import org.keycloak.models.KeycloakSessionFactory; -import org.keycloak.testsuite.KeycloakServer; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -31,6 +26,12 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.KeycloakSessionFactory; +import org.keycloak.testsuite.KeycloakServer; + +import org.jboss.logging.Logger; + /** * See Testsuite.md (section how to create many users and offline sessions) * diff --git a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/UserCommands.java b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/UserCommands.java index 7ce58fe4e34..afb6e883795 100644 --- a/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/UserCommands.java +++ b/testsuite/utils/src/main/java/org/keycloak/testsuite/util/cli/UserCommands.java @@ -17,6 +17,11 @@ package org.keycloak.testsuite.util.cli; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import org.keycloak.models.ClientModel; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -24,11 +29,6 @@ import org.keycloak.models.RoleModel; import org.keycloak.models.UserCredentialModel; import org.keycloak.models.UserModel; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - /** * @author Marek Posolda */ diff --git a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/JdbmPartitionFactoryFast.java b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/JdbmPartitionFactoryFast.java index a88c77085a8..0b69bcc7639 100644 --- a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/JdbmPartitionFactoryFast.java +++ b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/JdbmPartitionFactoryFast.java @@ -17,13 +17,13 @@ package org.keycloak.util.ldap; +import java.io.File; + import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.server.core.api.DnFactory; import org.apache.directory.server.core.factory.JdbmPartitionFactory; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition; -import java.io.File; - /** * @author Alexander Schwartz */ diff --git a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/KerberosKeytabCreator.java b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/KerberosKeytabCreator.java index 8dce8bb3159..01fee2c813a 100644 --- a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/KerberosKeytabCreator.java +++ b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/KerberosKeytabCreator.java @@ -17,13 +17,6 @@ package org.keycloak.util.ldap; -import org.apache.directory.server.kerberos.shared.crypto.encryption.KerberosKeyFactory; -import org.apache.directory.server.kerberos.shared.keytab.Keytab; -import org.apache.directory.server.kerberos.shared.keytab.KeytabEntry; -import org.apache.directory.shared.kerberos.KerberosTime; -import org.apache.directory.shared.kerberos.codec.types.EncryptionType; -import org.apache.directory.shared.kerberos.components.EncryptionKey; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -31,6 +24,13 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import org.apache.directory.server.kerberos.shared.crypto.encryption.KerberosKeyFactory; +import org.apache.directory.server.kerberos.shared.keytab.Keytab; +import org.apache.directory.server.kerberos.shared.keytab.KeytabEntry; +import org.apache.directory.shared.kerberos.KerberosTime; +import org.apache.directory.shared.kerberos.codec.types.EncryptionType; +import org.apache.directory.shared.kerberos.components.EncryptionKey; + /** * Helper utility for creating Keytab files. * 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 5e54dc91af6..f20e2f200e5 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 @@ -17,6 +17,17 @@ package org.keycloak.util.ldap; +import java.io.File; +import java.io.InputStream; +import java.security.KeyStore; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.keycloak.common.util.FindFile; +import org.keycloak.common.util.StreamUtil; + import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.text.StrSubstitutor; @@ -32,22 +43,12 @@ import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory; import org.apache.directory.server.core.factory.JdbmPartitionFactory; import org.apache.directory.server.core.normalization.NormalizationInterceptor; import org.apache.directory.server.ldap.ExtendedOperationHandler; -import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler; import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.server.ldap.handlers.extended.PwdModifyHandler; +import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler; 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.common.util.FindFile; -import org.keycloak.common.util.StreamUtil; - -import java.io.File; -import java.io.InputStream; -import java.security.KeyStore; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; /** * @author Marek Posolda diff --git a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/RangedAttributeInterceptor.java b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/RangedAttributeInterceptor.java index 29ad949cfa1..92a9361525f 100644 --- a/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/RangedAttributeInterceptor.java +++ b/util/embedded-ldap/src/main/java/org/keycloak/util/ldap/RangedAttributeInterceptor.java @@ -22,6 +22,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; + import org.apache.directory.api.ldap.model.cursor.ClosureMonitor; import org.apache.directory.api.ldap.model.cursor.CursorException; import org.apache.directory.api.ldap.model.entry.Attribute;